From ab2439f561ea06c816921804cce5657b3a860e4e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 1 Feb 2022 13:39:56 +0100 Subject: [PATCH 1/3] Fix first parameter of PositionOptional --- plugins/GCodeReader/FlavorParser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index bb99aa59ec..8d35bd3345 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -24,7 +24,7 @@ from cura.Settings.ExtruderManager import ExtruderManager catalog = i18nCatalog("cura") -PositionOptional = NamedTuple("Position", [("x", Optional[float]), ("y", Optional[float]), ("z", Optional[float]), ("f", Optional[float]), ("e", Optional[float])]) +PositionOptional = NamedTuple("PositionOptional", [("x", Optional[float]), ("y", Optional[float]), ("z", Optional[float]), ("f", Optional[float]), ("e", Optional[float])]) Position = NamedTuple("Position", [("x", float), ("y", float), ("z", float), ("f", float), ("e", List[float])]) From c70c312286eaf92918cf82406d002ea984aa3cc1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 1 Feb 2022 13:41:33 +0100 Subject: [PATCH 2/3] Fix check if spec in postprocessing was None --- plugins/PostProcessingPlugin/PostProcessingPlugin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index 8968e2c547..755d815d0a 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -193,6 +193,8 @@ class PostProcessingPlugin(QObject, Extension): spec = importlib.util.spec_from_file_location(__name__ + "." + script_name, file_path) + if spec is None: + continue loaded_script = importlib.util.module_from_spec(spec) if spec.loader is None: continue From 56c25db83a3ebec2366a96e8c13600ce104d3493 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 1 Feb 2022 13:47:14 +0100 Subject: [PATCH 3/3] Ignore the type of certifi --- plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py index d726cc04a9..8d08cde37b 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py @@ -12,7 +12,7 @@ from urllib.error import URLError from typing import Dict import ssl -import certifi +import certifi # type: ignore from .FirmwareUpdateCheckerLookup import FirmwareUpdateCheckerLookup, getSettingsKeyForMachine from .FirmwareUpdateCheckerMessage import FirmwareUpdateCheckerMessage