3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix several typing issues

Browse source 
Contributes to issue CURA-8587.
This commit is contained in:
Ghostkeeper 2021-12-06 17:22:07 +01:00
parent e525770332
commit aec643fd44
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/Marketplace/PackageList.py
View file

@ -4,7 +4,7 @@ import tempfile
import json
from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, Qt
from typing import Dict, Optional, Set, TYPE_CHECKING
from typing import cast, Dict, Optional, Set, TYPE_CHECKING
from UM.i18n import i18nCatalog
from UM.Qt.ListModel import ListModel
@ -14,7 +14,7 @@ from UM.Logger import Logger
from UM import PluginRegistry
from cura.CuraApplication import CuraApplication
from cura import CuraPackageManager
from cura.CuraPackageManager import CuraPackageManager
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope # To make requests to the Ultimaker API with correct authorization.
from .PackageModel import PackageModel
@ -22,6 +22,7 @@ from .Constants import USER_PACKAGES_URL
if TYPE_CHECKING:
from PyQt5.QtCore import QObject
from PyQt5.QtNetwork import QNetworkReply
catalog = i18nCatalog("cura")
@ -35,7 +36,7 @@ class PackageList(ListModel):
def __init__(self, parent: Optional["QObject"] = None) -> None:
super().__init__(parent)
self._manager: CuraPackageManager = CuraApplication.getInstance().getPackageManager()
self._manager: CuraPackageManager = cast(CuraPackageManager, CuraApplication.getInstance().getPackageManager())
self._plugin_registry: PluginRegistry = CuraApplication.getInstance().getPluginRegistry()
self._account = CuraApplication.getInstance().getCuraAPI().account
self._error_message = ""

6
plugins/Marketplace/PackageModel.py
View file

@ -71,11 +71,13 @@ class PackageModel(QObject):
self.sdk_version = package_data.get("sdk_version_semver", "")
# Note that there's a lot more info in the package_data than just these specified here.
def __eq__(self, other: Union[str, "PackageModel"]):
def __eq__(self, other: object):
if isinstance(other, PackageModel):
return other == self
else:
elif isinstance(other, str):
return other == self._package_id
else:
return False
def __repr__(self):
return f"<{self._package_id} : {self._package_version} : {self._section_title}>"