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

🐛 fix encoding for python 2

This commit is contained in:
thelastWallE 2021-11-03 20:51:34 +01:00
parent 7e1bdcba1c
commit afd97f9315
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
octoprint_klipper/__init__.py
View File

@ -186,8 +186,6 @@ class KlipperPlugin(
else: else:
check_parse = self._settings.get(["configuration", "parse_check"]) check_parse = self._settings.get(["configuration", "parse_check"])
if sys.version_info[0] < 3:
data["config"] = data["config"].encode('utf-8')
# check for configpath if it was changed during changing of the configfile # check for configpath if it was changed during changing of the configfile
if self.key_exist(data, "configuration", "configpath"): if self.key_exist(data, "configuration", "configpath"):
@ -220,7 +218,7 @@ class KlipperPlugin(
# Restart klippy to reload config # Restart klippy to reload config
self._printer.commands(reload_command) self._printer.commands(reload_command)
self.log_info("Restarting Klipper.") self.log_info("Restarting Klipper.")
# we dont want to write the klipper conf to the octoprint settings # we don't want to write the klipper conf to the octoprint settings
data.pop("config", None) data.pop("config", None)
# save the rest of changed settings into config.yaml of octoprint # save the rest of changed settings into config.yaml of octoprint
@ -488,14 +486,10 @@ class KlipperPlugin(
"Loading config with ISO-8859-1 finished." "Loading config with ISO-8859-1 finished."
) )
self._settings.set(["config"], data["config"]) self._settings.set(["config"], data["config"])
if sys.version_info[0] < 3:
data["config"] = data["config"].decode('utf-8')
return flask.jsonify(data=data["config"]) return flask.jsonify(data=data["config"])
else: else:
self._settings.set(["config"], data["config"]) self._settings.set(["config"], data["config"])
if sys.version_info[0] < 3:
data["config"] = data["config"].decode('utf-8')
return flask.jsonify(data=data["config"]) return flask.jsonify(data=data["config"])
elif command == "checkConfig": elif command == "checkConfig":
if "config" in data: if "config" in data: