diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index bc8c806699..d8de8efd5a 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -26,7 +26,6 @@ catalog = i18nCatalog("cura") import numpy import math -import copy from typing import List, Optional, TYPE_CHECKING, Any, Set, cast, Iterable, Dict diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f88467d651..62e11680ce 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1796,7 +1796,7 @@ class CuraApplication(QtApplication): try: result = workspace_reader.preRead(file_path, show_dialog=False) return result == WorkspaceReader.PreReadResult.accepted - except Exception as e: + except Exception: Logger.logException("e", "Could not check file %s", file_url) return False diff --git a/cura/Machines/Models/BuildPlateModel.py b/cura/Machines/Models/BuildPlateModel.py index c52228cf76..3697dd2762 100644 --- a/cura/Machines/Models/BuildPlateModel.py +++ b/cura/Machines/Models/BuildPlateModel.py @@ -2,13 +2,8 @@ # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt - -from UM.Application import Application from UM.Logger import Logger from UM.Qt.ListModel import ListModel -from UM.Util import parseBool - -from cura.Machines.VariantType import VariantType class BuildPlateModel(ListModel): @@ -26,4 +21,4 @@ class BuildPlateModel(ListModel): def _update(self): Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) self.setItems([]) - return \ No newline at end of file + return diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/Machines/Models/DiscoveredPrintersModel.py index a1b68ee1ae..c662334470 100644 --- a/cura/Machines/Models/DiscoveredPrintersModel.py +++ b/cura/Machines/Models/DiscoveredPrintersModel.py @@ -11,7 +11,6 @@ from UM.Util import parseBool from UM.OutputDevice.OutputDeviceManager import ManualDeviceAdditionAttempt if TYPE_CHECKING: - from PyQt5.QtCore import QObject from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin from cura.CuraApplication import CuraApplication from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index b2115ca099..c9e3ec4913 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -1,13 +1,12 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, TYPE_CHECKING +from typing import TYPE_CHECKING from UM.Logger import Logger from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal -from cura.Settings.cura_empty_instance_containers import empty_variant_container from cura.Machines.ContainerNode import ContainerNode from cura.Machines.MaterialNode import MaterialNode diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index 68756f8df6..0848623410 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -3,7 +3,6 @@ import json from datetime import datetime, timedelta -import os from typing import Optional, TYPE_CHECKING from urllib.parse import urlencode @@ -14,7 +13,6 @@ from PyQt5.QtGui import QDesktopServices from UM.Logger import Logger from UM.Message import Message -from UM.Platform import Platform from UM.Signal import Signal from cura.OAuth2.LocalAuthorizationServer import LocalAuthorizationServer diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index b3d108e1aa..62bf396878 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -12,7 +12,6 @@ from UM.Scene.SceneNode import SceneNode from UM.Scene.Selection import Selection from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator from UM.Settings.ContainerRegistry import ContainerRegistry # Finding containers by ID. -from UM.Decorators import deprecated from typing import Any, cast, Dict, List, Optional, TYPE_CHECKING, Union @@ -369,7 +368,7 @@ class ExtruderManager(QObject): printer = global_stack.getId(), expected = expected_extruder_definition_0_id, got = extruder_stack_0.definition.getId())) try: extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0] - except IndexError as e: + except IndexError: # It still needs to break, but we want to know what extruder ID made it break. msg = "Unable to find extruder definition with the id [%s]" % expected_extruder_definition_0_id Logger.logException("e", msg) diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index c1d59fb84a..53d41281e8 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -1,13 +1,12 @@ -#Copyright (c) 2019 Ultimaker B.V. -#Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot -from typing import Any, Dict, List, Optional, Set, Tuple, TYPE_CHECKING +from typing import Any, Dict, List, Set, Tuple, TYPE_CHECKING import cura.CuraApplication from UM.Logger import Logger from cura.Machines.ContainerTree import ContainerTree from cura.Settings.cura_empty_instance_containers import empty_intent_container -from UM.Settings.InstanceContainer import InstanceContainer if TYPE_CHECKING: from UM.Settings.InstanceContainer import InstanceContainer @@ -116,7 +115,7 @@ class IntentManager(QObject): ## The intent that gets selected by default when no intent is available for # the configuration, an extruder can't match the intent that the user # selects, or just when creating a new printer. - def getDefaultIntent(self) -> InstanceContainer: + def getDefaultIntent(self) -> "InstanceContainer": return empty_intent_container @pyqtProperty(str, notify = intentCategoryChanged) diff --git a/plugins/3MFReader/__init__.py b/plugins/3MFReader/__init__.py index ce94bbe69c..d68338c35f 100644 --- a/plugins/3MFReader/__init__.py +++ b/plugins/3MFReader/__init__.py @@ -12,7 +12,6 @@ except ImportError: from . import ThreeMFWorkspaceReader from UM.i18n import i18nCatalog -from UM.Platform import Platform catalog = i18nCatalog("cura") diff --git a/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py b/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py index 05f49017a3..c8d38bc177 100644 --- a/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py +++ b/plugins/LegacyProfileReader/tests/TestLegacyProfileReader.py @@ -5,7 +5,6 @@ import configparser # An input for some functions we're testing. import os.path # To find the integration test .ini files. import pytest # To register tests with. import unittest.mock # To mock the application, plug-in and container registry out. -import os.path import sys sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py index 3e1df1c7b8..61d0dbc0f0 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py +++ b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py @@ -1,7 +1,7 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal +from PyQt5.QtCore import pyqtProperty from UM.FlameProfiler import pyqtSlot from UM.Application import Application @@ -13,6 +13,7 @@ import UM.Settings.Models.SettingVisibilityHandler from cura.Settings.ExtruderManager import ExtruderManager #To get global-inherits-stack setting values from different extruders. from cura.Settings.SettingOverrideDecorator import SettingOverrideDecorator + ## The per object setting visibility handler ensures that only setting # definitions that have a matching instance Container are returned as visible. class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHandler.SettingVisibilityHandler): diff --git a/plugins/SimulationView/NozzleNode.py b/plugins/SimulationView/NozzleNode.py index 8a29871775..11b788c128 100644 --- a/plugins/SimulationView/NozzleNode.py +++ b/plugins/SimulationView/NozzleNode.py @@ -3,7 +3,6 @@ from UM.Application import Application from UM.Math.Color import Color -from UM.Math.Vector import Vector from UM.PluginRegistry import PluginRegistry from UM.Scene.SceneNode import SceneNode from UM.View.GL.OpenGL import OpenGL diff --git a/plugins/Toolbox/src/ConfigsModel.py b/plugins/Toolbox/src/ConfigsModel.py index dd54d53d93..9ba65caaa4 100644 --- a/plugins/Toolbox/src/ConfigsModel.py +++ b/plugins/Toolbox/src/ConfigsModel.py @@ -1,11 +1,10 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import re -from typing import Dict from PyQt5.QtCore import Qt, pyqtProperty from UM.Qt.ListModel import ListModel + ## Model that holds supported configurations (for material/quality packages). class ConfigsModel(ListModel): def __init__(self, parent = None): diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py index e54d99f1e6..9794da1bbb 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py @@ -2,8 +2,6 @@ # Cura is released under the terms of the LGPLv3 or higher. from typing import List, Optional, Union, Dict, Any -from PyQt5.QtCore import QUrl - from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel from .ClusterBuildPlate import ClusterBuildPlate diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py index af9635d384..8419b3beeb 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py @@ -6,7 +6,7 @@ import io #To write config files to strings as if they were files. from typing import Dict, List, Optional, Tuple import UM.VersionUpgrade -from UM.Logger import Logger + ## Creates a new profile instance by parsing a serialised profile in version 1 # of the file format. @@ -20,6 +20,7 @@ def importFrom(serialised: str, filename: str) -> Optional["Profile"]: except (configparser.Error, UM.VersionUpgrade.FormatException, UM.VersionUpgrade.InvalidVersionException): return None + ## A representation of a profile used as intermediary form for conversion from # one format to the other. class Profile: diff --git a/tests/API/TestAccount.py b/tests/API/TestAccount.py index fd3d5aea55..d2708638cb 100644 --- a/tests/API/TestAccount.py +++ b/tests/API/TestAccount.py @@ -1,9 +1,8 @@ -from unittest.mock import MagicMock, patch, PropertyMock +from unittest.mock import MagicMock import pytest -from cura.API import CuraAPI, Account -from cura.OAuth2.AuthorizationService import AuthorizationService +from cura.API import Account from cura.OAuth2.Models import UserProfile