fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 13:08:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle all keyring retrieval errors

Browse source
This commit is contained in:
karimpwnz 2021-01-02 16:40:13 +02:00
parent 5c78b6b20e
commit 4b973fe95d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jrnl/EncryptedJournal.py
View file

@ -176,7 +176,7 @@ def get_keychain(journal_name):
try: try:
return keyring.get_password("jrnl", journal_name) return keyring.get_password("jrnl", journal_name)
except (keyring.errors.KeyringLocked, RuntimeError): except (keyring.errors.KeyringError, RuntimeError):
return "" return ""
@ -186,12 +186,12 @@ def set_keychain(journal_name, password):
if password is None: if password is None:
try: try:
keyring.delete_password("jrnl", journal_name) keyring.delete_password("jrnl", journal_name)
except (keyring.errors.KeyringLocked, keyring.errors.PasswordDeleteError): except keyring.errors.KeyringError:
pass pass
else: else:
try: try:
keyring.set_password("jrnl", journal_name, password) keyring.set_password("jrnl", journal_name, password)
except (keyring.errors.KeyringLocked): except (keyring.errors.KeyringError):
pass pass
except (keyring.errors.NoKeyringError): except (keyring.errors.NoKeyringError):
print( print(