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

Revert "Add some kaizen changes from #5328"

Browse source 
This reverts commit 09fe06b8bf.
This commit is contained in:
Ian Paschal 2019-02-20 10:46:15 +01:00
parent 09fe06b8bf
commit cb8804b86a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/OAuth2/AuthorizationService.py
View file

@ -66,7 +66,11 @@ class AuthorizationService:
# \sa _parseJWT # \sa _parseJWT
def getUserProfile(self) -> Optional["UserProfile"]: def getUserProfile(self) -> Optional["UserProfile"]:
if not self._user_profile: if not self._user_profile:
self._user_profile = self._parseJWT() try:
self._user_profile = self._parseJWT()
except requests.exceptions.ConnectionError:
# Unable to get connection, can't login.
return None
if not self._user_profile and self._auth_data: if not self._user_profile and self._auth_data:
# If there is still no user profile from the JWT, we have to log in again. # If there is still no user profile from the JWT, we have to log in again.

6
plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
View file

@ -159,13 +159,9 @@ class CloudApiClient:
model: Type[CloudApiClientModel], model: Type[CloudApiClientModel],
) -> None: ) -> None:
def parse() -> None: def parse() -> None:
# Don't try to parse the reply if we didn't get one
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) is None:
return
status_code, response = self._parseReply(reply) status_code, response = self._parseReply(reply)
self._anti_gc_callbacks.remove(parse) self._anti_gc_callbacks.remove(parse)
self._parseModels(response, on_finished, model) return self._parseModels(response, on_finished, model)
return
self._anti_gc_callbacks.append(parse) self._anti_gc_callbacks.append(parse)
reply.finished.connect(parse) reply.finished.connect(parse)