From 534deae4a4614eb5b0cdb5a2bacbc0c102695132 Mon Sep 17 00:00:00 2001 From: Benjamin Salchow Date: Sun, 15 Mar 2020 13:38:05 +0100 Subject: [PATCH 1/4] adds python 3.7 compatibility --- octoprint_filamentmanager/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_filamentmanager/__init__.py b/octoprint_filamentmanager/__init__.py index 3988788..b1258b1 100644 --- a/octoprint_filamentmanager/__init__.py +++ b/octoprint_filamentmanager/__init__.py @@ -357,7 +357,7 @@ def get_update_information(self): __plugin_name__ = "Filament Manager" - +__plugin_pythoncompat__ = ">=2.7,<4" __required_octoprint_version__ = ">=1.3.6" From f97173cd63837c07fb46b21bbcbda01ee302a106 Mon Sep 17 00:00:00 2001 From: Benjamin Salchow Date: Sun, 15 Mar 2020 13:55:33 +0100 Subject: [PATCH 2/4] adds encoding to UTF-8 - required for python 3 --- octoprint_filamentmanager/api/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_filamentmanager/api/util.py b/octoprint_filamentmanager/api/util.py index 76d03ff..06bdce7 100644 --- a/octoprint_filamentmanager/api/util.py +++ b/octoprint_filamentmanager/api/util.py @@ -17,4 +17,4 @@ def add_revalidation_header_with_no_max_age(response, lm, etag): def entity_tag(lm): - return (hashlib.sha1(str(lm))).hexdigest() + return (hashlib.sha1(str(lm).encode(encoding='UTF-8')).hexdigest() From 49f863414f7c8241cb57bde15fff2ac49baa4fdb Mon Sep 17 00:00:00 2001 From: Benjamin Salchow Date: Sun, 15 Mar 2020 14:00:45 +0100 Subject: [PATCH 3/4] missing bracket --- octoprint_filamentmanager/api/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_filamentmanager/api/util.py b/octoprint_filamentmanager/api/util.py index 06bdce7..df6d95b 100644 --- a/octoprint_filamentmanager/api/util.py +++ b/octoprint_filamentmanager/api/util.py @@ -17,4 +17,4 @@ def add_revalidation_header_with_no_max_age(response, lm, etag): def entity_tag(lm): - return (hashlib.sha1(str(lm).encode(encoding='UTF-8')).hexdigest() + return (hashlib.sha1(str(lm).encode(encoding='UTF-8')).hexdigest()) From e0b50a81d650cb748da0bfe340a196a8a13e1627 Mon Sep 17 00:00:00 2001 From: Benjamin Salchow Date: Mon, 16 Mar 2020 18:05:06 +0100 Subject: [PATCH 4/4] fixes python3 xrange to range command --- octoprint_filamentmanager/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_filamentmanager/__init__.py b/octoprint_filamentmanager/__init__.py index b1258b1..dc26514 100644 --- a/octoprint_filamentmanager/__init__.py +++ b/octoprint_filamentmanager/__init__.py @@ -257,7 +257,7 @@ def calculate_weight(length, profile): volume = (length * PI * radius * radius) / 1000 # cm³ return volume * profile["density"] # g - for tool in xrange(0, numTools): + for tool in range(0, numTools): self._logger.info("Filament used: {length} mm (tool{id})" .format(length=str(extrusion[tool]), id=str(tool)))