diff --git a/plugins/CuraDrive/src/DriveApiService.py b/plugins/CuraDrive/src/DriveApiService.py index fa010d915d..0c8d38ebd2 100644 --- a/plugins/CuraDrive/src/DriveApiService.py +++ b/plugins/CuraDrive/src/DriveApiService.py @@ -33,7 +33,7 @@ class DriveApiService: def __init__(self) -> None: self._cura_api = CuraApplication.getInstance().getCuraAPI() - self._jsonCloudScope = JsonDecoratorScope(UltimakerCloudScope(CuraApplication.getInstance())) + self._json_cloud_scope = JsonDecoratorScope(UltimakerCloudScope(CuraApplication.getInstance())) def getBackups(self, changed: Callable[[List[Dict[str, Any]]], None]) -> None: def callback(reply: QNetworkReply, error: Optional["QNetworkReply.NetworkError"] = None) -> None: @@ -55,7 +55,7 @@ class DriveApiService: self.BACKUP_URL, callback= callback, error_callback = callback, - scope=self._jsonCloudScope + scope=self._json_cloud_scope ) def createBackup(self) -> None: @@ -105,7 +105,7 @@ class DriveApiService: url = "{}/{}".format(self.BACKUP_URL, backup_id), callback = finishedCallback, error_callback = errorCallback, - scope= self._jsonCloudScope + scope= self._json_cloud_scope ) @staticmethod diff --git a/plugins/Toolbox/src/CloudSync/DownloadPresenter.py b/plugins/Toolbox/src/CloudSync/DownloadPresenter.py index a16ed67218..a5d6eee0b6 100644 --- a/plugins/Toolbox/src/CloudSync/DownloadPresenter.py +++ b/plugins/Toolbox/src/CloudSync/DownloadPresenter.py @@ -11,7 +11,6 @@ from UM.Logger import Logger from UM.Message import Message from UM.Signal import Signal from UM.TaskManagement.HttpRequestManager import HttpRequestManager -from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope from cura.CuraApplication import CuraApplication from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope from .SubscribedPackagesModel import SubscribedPackagesModel @@ -30,7 +29,7 @@ class DownloadPresenter: self.done = Signal() self._app = app - self._scope = JsonDecoratorScope(UltimakerCloudScope(app)) + self._scope = UltimakerCloudScope(app) self._started = False self._progress_message = self._createProgressMessage() diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index ec1da6707a..38666bb6e2 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -52,7 +52,8 @@ class Toolbox(QObject, Extension): self._download_request_data = None # type: Optional[HttpRequestData] self._download_progress = 0 # type: float self._is_downloading = False # type: bool - self._scope = JsonDecoratorScope(UltimakerCloudScope(application)) # type: JsonDecoratorScope + self._cloud_scope = UltimakerCloudScope(application) # type: UltimakerCloudScope + self._json_scope = JsonDecoratorScope(self._cloud_scope) # type: JsonDecoratorScope self._request_urls = {} # type: Dict[str, str] self._to_update = [] # type: List[str] # Package_ids that are waiting to be updated @@ -149,7 +150,7 @@ class Toolbox(QObject, Extension): url = "{base_url}/packages/{package_id}/ratings".format(base_url = CloudApiModel.api_url, package_id = package_id) data = "{\"data\": {\"cura_version\": \"%s\", \"rating\": %i}}" % (Version(self._application.getVersion()), rating) - self._application.getHttpRequestManager().put(url, data = data.encode(), scope = self._scope) + self._application.getHttpRequestManager().put(url, data = data.encode(), scope = self._json_scope) def getLicenseDialogPluginFileLocation(self) -> str: return self._license_dialog_plugin_file_location @@ -539,7 +540,7 @@ class Toolbox(QObject, Extension): self._application.getHttpRequestManager().get(url, callback = callback, error_callback = error_callback, - scope=self._scope) + scope=self._json_scope) @pyqtSlot(str) def startDownload(self, url: str) -> None: @@ -552,7 +553,7 @@ class Toolbox(QObject, Extension): callback = callback, error_callback = error_callback, download_progress_callback = download_progress_callback, - scope=self._scope + scope=self._cloud_scope ) self._download_request_data = request_data