Improved exception handling in Keyring methods

Details: * Added missing exception handling to 'Keyring.set_password()' and improved exception chaining in 'Keyring.get_password()'. Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>
andy-maier · Apr 4, 2021 · d99060a · d99060a
1 parent 2a61ff3
commit d99060a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -36,6 +36,9 @@ Released: not yet
 * Fixed that the package did not contain the files for the 'easy-vault'
   command. (issue #45)
 
+* Added missing exception handling to 'Keyring.set_password()' and improved
+  exception chaining in 'Keyring.get_password()'.
+
 **Enhancements:**
 
 **Cleanup:**

diff --git a/easy_vault/_keyring.py b/easy_vault/_keyring.py
@@ -104,9 +104,13 @@ def get_password(self, filepath):
             return keyring.get_password(
                 self.keyring_service(), self.keyring_username(filepath))
         except NO_KEYRING_EXCEPTION as exc:
-            raise KeyringNotAvailable(str(exc))
+            new_exc = KeyringNotAvailable(str(exc))
+            new_exc.__cause__ = None
+            raise new_exc  # KeyringNotAvailable
         except keyring.errors.KeyringError as exc:
-            raise KeyringError(str(exc))
+            new_exc = KeyringError(str(exc))
+            new_exc.__cause__ = None
+            raise new_exc  # KeyringError
 
     def set_password(self, filepath, password):
         """
@@ -125,8 +129,18 @@ def set_password(self, filepath, password):
           :exc:`KeyringNotAvailable`: No keyring service available.
           :exc:`KeyringError`: An error happend in the keyring service.
         """
-        keyring.set_password(
-            self.keyring_service(), self.keyring_username(filepath), password)
+        try:
+            keyring.set_password(
+                self.keyring_service(),
+                self.keyring_username(filepath), password)
+        except NO_KEYRING_EXCEPTION as exc:
+            new_exc = KeyringNotAvailable(str(exc))
+            new_exc.__cause__ = None
+            raise new_exc  # KeyringNotAvailable
+        except keyring.errors.KeyringError as exc:
+            new_exc = KeyringError(str(exc))
+            new_exc.__cause__ = None
+            raise new_exc  # KeyringError
 
     def is_available(self):
         """