From 8d9e9a9dbfda03f2f510df16a8ef415f4244993c Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 12 Sep 2022 17:04:40 +0200 Subject: [PATCH] Use modern python typing CURA-9278 --- cura/PrinterOutput/Models/ExtruderConfigurationModel.py | 6 +++--- cura/Settings/MachineManager.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index 4cc3e81f56..d54092b8c9 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -13,9 +13,9 @@ class ExtruderConfigurationModel(QObject): def __init__(self, position: int = -1) -> None: super().__init__() - self._position = position # type: int - self._material = None # type: Optional[MaterialOutputModel] - self._hotend_id = None # type: Optional[str] + self._position: int = position + self._material: Optional[MaterialOutputModel] = None + self._hotend_id: Optional[str] = None def setPosition(self, position: int) -> None: self._position = position diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ca45cdc4b9..2051ce1b99 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -99,7 +99,7 @@ class MachineManager(QObject): self._application.getPreferences().addPreference("cura/active_machine", "") - self._printer_output_devices = [] # type: List[PrinterOutputDevice] + self._printer_output_devices: List[PrinterOutputDevice] = [] self._application.getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged) # There might already be some output devices by the time the signal is connected self._onOutputDevicesChanged() @@ -112,7 +112,7 @@ class MachineManager(QObject): self._application.callLater(self.setInitialActiveMachine) - containers = CuraContainerRegistry.getInstance().findInstanceContainers(id = self.activeMaterialId) # type: List[InstanceContainer] + containers: List[InstanceContainer] = CuraContainerRegistry.getInstance().findInstanceContainers(id = self.activeMaterialId) if containers: containers[0].nameChanged.connect(self._onMaterialNameChanged)