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

Merge pull request #9501 from Ultimaker/CURA-7180_keyring_none_value

Browse Source 
Handle storing None values in keyring
This commit is contained in:
Remco Burema 2021-04-06 12:31:45 +02:00 committed by GitHub
commit 40fb430277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/OAuth2/KeyringAttribute.py
View File

@ -29,7 +29,8 @@ class KeyringAttribute:
def __get__(self, instance: Type["BaseModel"], owner: type) -> str: def __get__(self, instance: Type["BaseModel"], owner: type) -> str:
if self._store_secure: if self._store_secure:
try: try:
return keyring.get_password("cura", self._keyring_name) value = keyring.get_password("cura", self._keyring_name)
return value if value != "" else None
except NoKeyringError: except NoKeyringError:
self._store_secure = False self._store_secure = False
Logger.logException("w", "No keyring backend present") Logger.logException("w", "No keyring backend present")
@ -41,7 +42,7 @@ class KeyringAttribute:
if self._store_secure: if self._store_secure:
setattr(instance, self._name, None) setattr(instance, self._name, None)
try: try:
keyring.set_password("cura", self._keyring_name, value) keyring.set_password("cura", self._keyring_name, value if value is not None else "")
except PasswordSetError: except PasswordSetError:
self._store_secure = False self._store_secure = False
if self._name not in DONT_EVER_STORE_LOCALLY: if self._name not in DONT_EVER_STORE_LOCALLY: