Move PrinterOutputDevice into cura.PrinterOutput module

cura/CuraApplication.py

@@ -113,7 +113,7 @@ from cura.UI.ObjectsModel import ObjectsModel
 
 from cura.Machines.Models.DiscoveredPrintersModel import DiscoveredPrintersModel
 
-from cura.PrinterOutputDevice import PrinterOutputDevice
+from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage
 
 from cura import ApplicationMetadata, UltimakerCloudAuthentication

cura/PrinterOutput/FirmwareUpdater.py

@@ -9,7 +9,7 @@ from typing import Union
 
 MYPY = False
 if MYPY:
-    from cura.PrinterOutputDevice import PrinterOutputDevice
+    from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 
 class FirmwareUpdater(QObject):
     firmwareProgressChanged = pyqtSignal()

cura/PrinterOutput/GenericOutputController.py

@@ -3,9 +3,10 @@
 
 from typing import TYPE_CHECKING, Set, Union, Optional
 
-from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 from PyQt5.QtCore import QTimer
 
+from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
+
 if TYPE_CHECKING:
     from cura.UI.PrintJobOutputModel import PrintJobOutputModel
     from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel

cura/PrinterOutput/NetworkedPrinterOutputDevice.py

@@ -7,7 +7,7 @@ from UM.Scene.SceneNode import SceneNode #For typing.
 from cura.API import Account
 from cura.CuraApplication import CuraApplication
 
-from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
 
 from PyQt5.QtNetwork import QHttpMultiPart, QHttpPart, QNetworkRequest, QNetworkAccessManager, QNetworkReply, QAuthenticator
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl, QCoreApplication

cura/Settings/MachineManager.py

@@ -22,7 +22,7 @@ from UM.Settings.SettingFunction import SettingFunction
 from UM.Signal import postponeSignals, CompressTechnique
 
 from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
-from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType
 from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
 from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel

cura/UI/GlobalStacksModel.py

@@ -1,12 +1,12 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import pyqtProperty, Qt, QTimer
+from PyQt5.QtCore import Qt, QTimer
 
 from UM.Qt.ListModel import ListModel
 from UM.i18n import i18nCatalog
 
-from cura.PrinterOutputDevice import ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 from cura.Settings.GlobalStack import GlobalStack
 

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -19,7 +19,7 @@ from UM.Scene.SceneNode import SceneNode
 from cura.CuraApplication import CuraApplication
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
-from cura.PrinterOutputDevice import ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from .CloudOutputController import CloudOutputController
 from ..MeshFormatHandler import MeshFormatHandler

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -24,7 +24,7 @@ from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationM
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
 from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
-from cura.PrinterOutputDevice import ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from .Cloud.Utils import formatTimeCompleted, formatDateCompleted
 from .ClusterUM3PrinterOutputController import ClusterUM3PrinterOutputController

plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py

@@ -18,7 +18,7 @@ from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 from .UM3OutputDevicePlugin import UM3OutputDevicePlugin
 
 if TYPE_CHECKING:
-    from cura.PrinterOutputDevice import PrinterOutputDevice
+    from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 
 catalog = i18nCatalog("cura")
 

plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py

@@ -5,7 +5,7 @@ from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutp
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
 from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel
-from cura.PrinterOutputDevice import ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from cura.Settings.ContainerManager import ContainerManager
 from cura.Settings.ExtruderManager import ExtruderManager

plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py

@@ -8,12 +8,11 @@ import os
 
 from zeroconf import Zeroconf, ServiceBrowser, ServiceStateChange, ServiceInfo
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager
-from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject
+from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QDesktopServices
 
 from cura.CuraApplication import CuraApplication
-from cura.PrinterOutputDevice import ConnectionType
-from cura.Settings.GlobalStack import GlobalStack # typing
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from UM.i18n import i18nCatalog
 from UM.Logger import Logger

plugins/USBPrinting/AvrFirmwareUpdater.py

@@ -13,7 +13,7 @@ from time import sleep
 
 MYPY = False
 if MYPY:
-    from cura.PrinterOutputDevice import PrinterOutputDevice
+    from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 
 
 class AvrFirmwareUpdater(FirmwareUpdater):

plugins/USBPrinting/USBPrinterOutputDevice.py

@@ -7,7 +7,7 @@ from UM.i18n import i18nCatalog
 from UM.Qt.Duration import DurationFormat
 
 from cura.CuraApplication import CuraApplication
-from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
 from cura.UI.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.GenericOutputController import GenericOutputController

plugins/USBPrinting/USBPrinterOutputDeviceManager.py

@@ -5,15 +5,13 @@ import threading
 import time
 import serial.tools.list_ports
 
-from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
+from PyQt5.QtCore import QObject, pyqtSignal
 
-from UM.Logger import Logger
 from UM.Signal import Signal, signalemitter
 from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
 from UM.i18n import i18nCatalog
 
-from cura.PrinterOutputDevice import ConnectionState
-from cura.CuraApplication import CuraApplication
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionState
 
 from . import USBPrinterOutputDevice
 

plugins/UltimakerMachineActions/BedLevelMachineAction.py

@@ -4,7 +4,7 @@
 from typing import List
 
 from cura.MachineAction import MachineAction
-from cura.PrinterOutputDevice import PrinterOutputDevice
+from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 
 from UM.FlameProfiler import pyqtSlot
 

plugins/UltimakerMachineActions/UMOCheckupMachineAction.py

@@ -1,5 +1,5 @@
 from cura.MachineAction import MachineAction
-from cura.PrinterOutputDevice import PrinterOutputDevice
+from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 from UM.Application import Application
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty
 

plugins/VersionUpgrade/VersionUpgrade35to40/VersionUpgrade35to40.py

@@ -3,7 +3,7 @@ from typing import Tuple, List, Set, Dict
 import io
 
 from UM.VersionUpgrade import VersionUpgrade
-from cura.PrinterOutputDevice import ConnectionType
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 deleted_settings = {"bridge_wall_max_overhang"}  # type: Set[str]
 renamed_configurations = {"connect_group_name": "group_name"}  # type: Dict[str, str]

tests/PrinterOutput/TestNetworkedPrinterOutputDevice.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
 from PyQt5.QtNetwork import QNetworkAccessManager
 from PyQt5.QtCore import QUrl
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState
-from cura.PrinterOutputDevice import ConnectionState
+from cura.PrinterOutput.PrinterOutputDevice import ConnectionState
 
 
 def test_properties():

tests/PrinterOutput/TestPrinterOutputDevice.py

@@ -1,7 +1,7 @@
 from unittest.mock import MagicMock
 
 import pytest
-from cura.PrinterOutputDevice import PrinterOutputDevice
+from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 
 test_validate_data_get_set = [
     {"attribute": "connectionText", "value": "yay"},
@@ -34,4 +34,4 @@ def test_getAndSet(data):
     # Attempt to set the value again
     getattr(model, "set" + attribute)(data["value"])
     # The signal should not fire again
-    assert signal.emit.call_count == 1
+    assert signal.emit.call_count == 1