3diy
/
OctoprintKlipperPlugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

All strings are unicode in Python 3

This commit is contained in:
Alice Grey 2020-08-29 17:25:20 -05:00
parent 89156d51f3
commit a3a4202b00
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octoprint_klipper/__init__.py
View File

@ -35,7 +35,7 @@ class KlipperPlugin(
_message = "" _message = ""
#-- Startup Plugin #-- Startup Plugin
def on_after_startup(self): def on_after_startup(self):
klipper_port = self._settings.get(["connection", "port"]) klipper_port = self._settings.get(["connection", "port"])
additional_ports = self._settings.global_get(["serial", "additionalPorts"]) additional_ports = self._settings.global_get(["serial", "additionalPorts"])
@ -76,10 +76,10 @@ class KlipperPlugin(
reload_command="RESTART" reload_command="RESTART"
) )
) )
def on_settings_load(self): def on_settings_load(self):
data = octoprint.plugin.SettingsPlugin.on_settings_load(self) data = octoprint.plugin.SettingsPlugin.on_settings_load(self)
filepath = os.path.expanduser( filepath = os.path.expanduser(
self._settings.get(["configuration", "path"]) self._settings.get(["configuration", "path"])
) )
@ -99,9 +99,7 @@ class KlipperPlugin(
filepath = os.path.expanduser( filepath = os.path.expanduser(
self._settings.get(["configuration", "path"]) self._settings.get(["configuration", "path"])
) )
# Check for Unicode config file and convert to String, if so. data["config"] = data["config"].encode('utf-8')
if type(data["config"]) == str:
data["config"] = data["config"].encode('utf-8')
f = open(filepath, "w") f = open(filepath, "w")
f.write(data["config"]) f.write(data["config"])