From abb6d20bebe6b1de1fca4dc086164e68982e6a03 Mon Sep 17 00:00:00 2001 From: joeydelarago Date: Wed, 24 Aug 2022 14:06:30 +0200 Subject: [PATCH] Remove enum, python has no build in support for getting enum from string value. This will be in Python 3.11 though. CURA-9221 --- plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py | 4 ++-- .../src/Models/Http/CloudPrintJobResponse.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 0eb0644676..c8a6b30d90 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -31,7 +31,7 @@ from ..Models.Http.CloudClusterResponse import CloudClusterResponse from ..Models.Http.CloudClusterStatus import CloudClusterStatus from ..Models.Http.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest from ..Models.Http.CloudPrintResponse import CloudPrintResponse -from ..Models.Http.CloudPrintJobResponse import CloudPrintJobResponse, CloudUploadStatus +from ..Models.Http.CloudPrintJobResponse import CloudPrintJobResponse from ..Models.Http.ClusterPrinterStatus import ClusterPrinterStatus from ..Models.Http.ClusterPrintJobStatus import ClusterPrintJobStatus @@ -232,7 +232,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): :param job_response: The response received from the cloud API. """ - if job_response.status is CloudUploadStatus.WAIT_APPROVAL: + if job_response.status is "wait_approval": PrintJobPendingApprovalMessage().show() if not self._tool_path: diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobResponse.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobResponse.py index eb824c2708..170adf593d 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobResponse.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobResponse.py @@ -26,7 +26,7 @@ class CloudPrintJobResponse(BaseModel): """ self.job_id = job_id - self.status: CloudUploadStatus = CloudUploadStatus(status) + self.status = status self.download_url = download_url self.job_name = job_name self.upload_url = upload_url @@ -34,9 +34,3 @@ class CloudPrintJobResponse(BaseModel): self.status_description = status_description self.slicing_details = slicing_details super().__init__(**kwargs) - - -class CloudUploadStatus(Enum): - FAILED = "failed", - QUEUED = "queued", - WAIT_APPROVAL = "wait_approval"