GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 02:53:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't check against generic exception

Browse Source 
Define the KeychainDenied exception locally in non-Mac operating systems.

CURA-8332
This commit is contained in:
Konstantinos Karmas 2021-06-21 16:47:47 +02:00
parent 7785142831
commit 9fd0ac333e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cura/OAuth2/KeyringAttribute.py
View File

@ -4,7 +4,7 @@ from typing import Type, TYPE_CHECKING, Optional, List
import keyring
from keyring.backend import KeyringBackend
from keyring.errors import NoKeyringError, PasswordSetError
from keyring.errors import NoKeyringError, PasswordSetError, KeyringError
from UM.Logger import Logger
@ -22,6 +22,9 @@ if Platform.isOSX() and hasattr(sys, "frozen"):
from keyring.backends.macOS import Keyring
from keyring.backends.macOS.api import KeychainDenied
keyring.set_keyring(Keyring())
else:
class KeychainDenied(Exception):
pass
# Even if errors happen, we don't want this stored locally:
DONT_EVER_STORE_LOCALLY: List[str] = ["refresh_token"]
@ -40,12 +43,9 @@ class KeyringAttribute:
self._store_secure = False
Logger.logException("w", "No keyring backend present")
return getattr(instance, self._name)
except Exception as e:
except KeychainDenied:
self._store_secure = False
if Platform.isOSX() and hasattr(sys, "frozen") and type(e) == KeychainDenied:
Logger.log("i", "Access to the keyring was denied.")
else:
Logger.logException("w", f"Something went wrong while trying to retrieve the password from the Keyring. Exception: {e}")
Logger.log("i", "Access to the keyring was denied.")
return getattr(instance, self._name)
else:
return getattr(instance, self._name)