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

Merge branch 'typing_keyattribute' of github.com:Ultimaker/Cura into fix_tests_python_upgrade

Browse Source
This commit is contained in:
Jaime van Kessel 2021-04-07 15:43:03 +02:00
commit 8cc091fd0a
No known key found for this signature in database
GPG Key ID: 3710727397403C91
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cura/OAuth2/KeyringAttribute.py
View File

@ -1,6 +1,6 @@
# Copyright (c) 2021 Ultimaker B.V. # Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from typing import Type, TYPE_CHECKING from typing import Type, TYPE_CHECKING, Optional, List
import keyring import keyring
from keyring.backend import KeyringBackend from keyring.backend import KeyringBackend
@ -20,18 +20,15 @@ if Platform.isWindows() and hasattr(sys, "frozen"):
keyring.set_keyring(WinVaultKeyring()) keyring.set_keyring(WinVaultKeyring())
# Even if errors happen, we don't want this stored locally: # Even if errors happen, we don't want this stored locally:
DONT_EVER_STORE_LOCALLY = ["refresh_token"] DONT_EVER_STORE_LOCALLY: List[str] = ["refresh_token"]
class KeyringAttribute: class KeyringAttribute:
def __init__(self) -> None:
self._store_secure = True
""" """
Descriptor for attributes that need to be stored in the keyring. With Fallback behaviour to the preference cfg file Descriptor for attributes that need to be stored in the keyring. With Fallback behaviour to the preference cfg file
""" """
def __get__(self, instance: "BaseModel", owner: type) -> str: def __get__(self, instance: "BaseModel", owner: type) -> Optional[str]:
if self._store_secure: if self._store_secure: # type: ignore
try: try:
value = keyring.get_password("cura", self._keyring_name) value = keyring.get_password("cura", self._keyring_name)
return value if value != "" else None return value if value != "" else None
@ -42,7 +39,7 @@ class KeyringAttribute:
else: else:
return getattr(instance, self._name) return getattr(instance, self._name)
def __set__(self, instance: "BaseModel", value: str): def __set__(self, instance: "BaseModel", value: Optional[str]):
if self._store_secure: if self._store_secure:
setattr(instance, self._name, None) setattr(instance, self._name, None)
try: try: