Fix Toolbox import error (continued)

(and remove unused import)

CURA-6983

plugins/Toolbox/src/AuthorsModel.py

@@ -4,7 +4,7 @@
 import re
 from typing import Dict, List, Optional, Union
 
-from PyQt5.QtCore import Qt, pyqtProperty, pyqtSignal
+from PyQt5.QtCore import Qt, pyqtProperty
 
 from UM.Qt.ListModel import ListModel
 

plugins/Toolbox/src/CloudSync/CloudPackageChecker.py

@@ -8,10 +8,10 @@ from UM import i18nCatalog
 from UM.Logger import Logger
 from UM.Message import Message
 from UM.Signal import Signal
-from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
 from cura.CuraApplication import CuraApplication
-from plugins.Toolbox.src.CloudApiModel import CloudApiModel
-from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel
+from ..CloudApiModel import CloudApiModel
+from .SubscribedPackagesModel import SubscribedPackagesModel
+from ..UltimakerCloudScope import UltimakerCloudScope
 
 
 class CloudPackageChecker(QObject):

plugins/Toolbox/src/CloudSync/CloudPackageManager.py

@@ -1,6 +1,6 @@
 from cura.CuraApplication import CuraApplication
-from plugins.Toolbox.src.CloudApiModel import CloudApiModel
-from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
+from ..CloudApiModel import CloudApiModel
+from ..UltimakerCloudScope import UltimakerCloudScope
 
 
 ## Manages Cloud subscriptions. When a package is added to a user's account, the user is 'subscribed' to that package

plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py

@@ -1,11 +1,11 @@
 import os
-from typing import Optional, Dict
+from typing import Optional
 
 from PyQt5.QtCore import QObject, pyqtSlot
 
 from UM.Qt.QtApplication import QtApplication
 from UM.Signal import Signal
-from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel
+from .SubscribedPackagesModel import SubscribedPackagesModel
 
 
 ## Shows a list of packages to be added or removed. The user can select which packages to (un)install. The user's

plugins/Toolbox/src/CloudSync/DownloadPresenter.py

@@ -1,7 +1,5 @@
-import os
 import tempfile
-from functools import reduce
-from typing import Dict, List, Optional, Any
+from typing import Dict, List, Any
 
 from PyQt5.QtNetwork import QNetworkReply
 
@@ -11,8 +9,8 @@ from UM.Message import Message
 from UM.Signal import Signal
 from UM.TaskManagement.HttpRequestManager import HttpRequestManager
 from cura.CuraApplication import CuraApplication
-from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
-from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel
+from .SubscribedPackagesModel import SubscribedPackagesModel
+from ..UltimakerCloudScope import UltimakerCloudScope
 
 
 ## Downloads a set of packages from the Ultimaker Cloud Marketplace

plugins/Toolbox/src/CloudSync/LicensePresenter.py

@@ -8,7 +8,7 @@ from UM.Signal import Signal
 from cura.CuraApplication import CuraApplication
 from UM.i18n import i18nCatalog
 
-from plugins.Toolbox.src.CloudSync.LicenseModel import LicenseModel
+from .LicenseModel import LicenseModel
 
 
 ## Call present() to show a licenseDialog for a set of packages

plugins/Toolbox/src/CloudSync/RestartApplicationPresenter.py

@@ -1,18 +1,6 @@
-import os
-import tempfile
-from functools import reduce
-from typing import Dict, List, Optional, Any
-
-from PyQt5.QtNetwork import QNetworkReply
-
-from UM import i18n_catalog, i18nCatalog
-from UM.Logger import Logger
+from UM import i18nCatalog
 from UM.Message import Message
-from UM.Signal import Signal
-from UM.TaskManagement.HttpRequestManager import HttpRequestManager
 from cura.CuraApplication import CuraApplication
-from plugins.Toolbox.src.UltimakerCloudScope import UltimakerCloudScope
-from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel
 
 
 ## Presents a dialog telling the user that a restart is required to apply changes

plugins/Toolbox/src/CloudSync/SyncOrchestrator.py

@@ -3,16 +3,15 @@ from typing import List, Dict, Any
 
 from UM.Extension import Extension
 from UM.Logger import Logger
-from UM.PackageManager import PackageManager
 from UM.PluginRegistry import PluginRegistry
 from cura.CuraApplication import CuraApplication
-from plugins.Toolbox.src.CloudSync.CloudPackageChecker import CloudPackageChecker
-from plugins.Toolbox.src.CloudSync.CloudPackageManager import CloudPackageManager
-from plugins.Toolbox.src.CloudSync.DiscrepanciesPresenter import DiscrepanciesPresenter
-from plugins.Toolbox.src.CloudSync.DownloadPresenter import DownloadPresenter
-from plugins.Toolbox.src.CloudSync.LicensePresenter import LicensePresenter
-from plugins.Toolbox.src.CloudSync.RestartApplicationPresenter import RestartApplicationPresenter
-from plugins.Toolbox.src.CloudSync.SubscribedPackagesModel import SubscribedPackagesModel
+from .CloudPackageChecker import CloudPackageChecker
+from .CloudPackageManager import CloudPackageManager
+from .DiscrepanciesPresenter import DiscrepanciesPresenter
+from .DownloadPresenter import DownloadPresenter
+from .LicensePresenter import LicensePresenter
+from .RestartApplicationPresenter import RestartApplicationPresenter
+from .SubscribedPackagesModel import SubscribedPackagesModel
 
 
 ## Orchestrates the synchronizing of packages from the user account to the installed packages

plugins/Toolbox/src/ConfigsModel.py

@@ -1,7 +1,8 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import Qt, pyqtProperty
+from PyQt5.QtCore import Qt
+
 from UM.Qt.ListModel import ListModel
 
 

plugins/Toolbox/src/Toolbox.py

@@ -4,7 +4,6 @@
 import json
 import os
 import tempfile
-import platform
 from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional, Union
 
 from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot
@@ -19,8 +18,8 @@ from UM.Version import Version
 from cura import ApplicationMetadata
 from cura.CuraApplication import CuraApplication
 from cura.Machines.ContainerTree import ContainerTree
-from .CloudApiModel import CloudApiModel
 
+from .CloudApiModel import CloudApiModel
 from .AuthorsModel import AuthorsModel
 from .CloudSync.LicenseModel import LicenseModel
 from .PackagesModel import PackagesModel