3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '2.3'

Browse source 
* 2.3:
  Set encoding to utf-8 when writing files
  Remove manually specified utf-8 encoding
  SettingInstanceManager now also watches containerchanged of extruder stacks
This commit is contained in:
Arjen Hiemstra 2016-10-24 14:30:22 +02:00
commit 448d7d890c
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
View file

@ -71,7 +71,7 @@ class RemovableDriveOutputDevice(OutputDevice):
try:
Logger.log("d", "Writing to %s", file_name)
# Using buffering greatly reduces the write time for many lines of gcode
self._stream = open(file_name, "wt", buffering = 1)
self._stream = open(file_name, "wt", buffering = 1, encoding = "utf-8")
job = WriteMeshJob(writer, self._stream, nodes, MeshWriter.OutputMode.TextMode)
job.setFileName(file_name)
job.progress.connect(self._onProgress)

2
plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py
View file

@ -111,7 +111,7 @@ class MachineInstance:
user_profile_file = os.path.join(user_storage, urllib.parse.quote_plus(self._name) + "_current_settings.inst.cfg")
if not os.path.exists(user_storage):
os.makedirs(user_storage)
with open(user_profile_file, "w") as file_handle:
with open(user_profile_file, "w", encoding = "utf-8") as file_handle:
user_profile.write(file_handle)
version_upgrade_manager.upgradeExtraFile(user_storage, urllib.parse.quote_plus(self._name), "user")