diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2020-06-15 15:10:20 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2020-06-15 15:10:20 +0300 |
| commit | f6e9bc7c3ca98f632d1abe1e03d43646b6f9c346 (patch) | |
| tree | 3f99099371007a50b16ba0e88f2fa41d608758ee /cura/API | |
| parent | 0edb93176a6f4698065686f8f4645adc569cb5f8 (diff) | |
| parent | 0f3a977a588ddb8ccc4c9e6dc97c1494fb25b8bd (diff) | |
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7418-update-profile-window
Diffstat (limited to 'cura/API')
| -rw-r--r-- | cura/API/Account.py | 4 | ||||
| -rw-r--r-- | cura/API/ConnectionStatus.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cura/API/Account.py b/cura/API/Account.py index 4868204a94..e190fe9b42 100644 --- a/cura/API/Account.py +++ b/cura/API/Account.py @@ -10,7 +10,7 @@ from UM.Message import Message from UM.i18n import i18nCatalog from cura.OAuth2.AuthorizationService import AuthorizationService from cura.OAuth2.Models import OAuth2Settings -from cura.UltimakerCloud import UltimakerCloudAuthentication +from cura.UltimakerCloud import UltimakerCloudConstants if TYPE_CHECKING: from cura.CuraApplication import CuraApplication @@ -69,7 +69,7 @@ class Account(QObject): self._last_sync_str = "-" self._callback_port = 32118 - self._oauth_root = UltimakerCloudAuthentication.CuraCloudAccountAPIRoot + self._oauth_root = UltimakerCloudConstants.CuraCloudAccountAPIRoot self._oauth_settings = OAuth2Settings( OAUTH_SERVER_URL= self._oauth_root, diff --git a/cura/API/ConnectionStatus.py b/cura/API/ConnectionStatus.py index 332e519ca9..007f03fdd1 100644 --- a/cura/API/ConnectionStatus.py +++ b/cura/API/ConnectionStatus.py @@ -4,14 +4,14 @@ from PyQt5.QtCore import QObject, pyqtSignal, QTimer, pyqtProperty from PyQt5.QtNetwork import QNetworkReply from UM.TaskManagement.HttpRequestManager import HttpRequestManager -from cura.UltimakerCloud import UltimakerCloudAuthentication +from cura.UltimakerCloud import UltimakerCloudConstants class ConnectionStatus(QObject): """Status info for some web services""" UPDATE_INTERVAL = 10.0 # seconds - ULTIMAKER_CLOUD_STATUS_URL = UltimakerCloudAuthentication.CuraCloudAPIRoot + "/connect/v1/" + ULTIMAKER_CLOUD_STATUS_URL = UltimakerCloudConstants.CuraCloudAPIRoot + "/connect/v1/" __instance = None # type: Optional[ConnectionStatus] |