Merge pull request #567 from pypa/catch-keyring-errors

Catch errors getting/setting password with keyring
pypa · Aug 2, 2022 · fd209d7 · fd209d7
2 parents 0850387 + 73d251b
commit fd209d7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/flit/upload.py b/flit/upload.py
@@ -145,14 +145,17 @@ def get_password(repo, prefer_env):
         return repo['password']
 
     try:
-        import keyring
+        import keyring, keyring.errors
     except ImportError:  # pragma: no cover
         log.warning("Install keyring to store passwords securely")
         keyring = None
     else:
-        stored_pw = keyring.get_password(repo['url'], repo['username'])
-        if stored_pw is not None:
-            return stored_pw
+        try:
+            stored_pw = keyring.get_password(repo['url'], repo['username'])
+            if stored_pw is not None:
+                return stored_pw
+        except keyring.errors.KeyringError as e:
+            log.warning("Could not get password from keyring (%s)", e)
 
     if sys.stdin.isatty():
         pw = None
@@ -164,8 +167,11 @@ def get_password(repo, prefer_env):
         raise Exception("Could not find password for upload.")
 
     if keyring is not None:
-        keyring.set_password(repo['url'], repo['username'], pw)
-        log.info("Stored password with keyring")
+        try:
+            keyring.set_password(repo['url'], repo['username'], pw)
+            log.info("Stored password with keyring")
+        except keyring.errors.KeyringError as e:
+            log.warning("Could not store password in keyring (%s)", e)
 
     return pw
 

diff --git a/tests/test_upload.py b/tests/test_upload.py
@@ -77,21 +77,19 @@ def test_get_repository_env():
 
 @contextmanager
 def _fake_keyring(pw):
-    real_keyring = sys.modules.get('keyring', None)
     class FakeKeyring:
         @staticmethod
         def get_password(service_name, username):
             return pw
 
-    sys.modules['keyring'] = FakeKeyring()
+    class FakeKeyringErrMod:
+        class KeyringError(Exception):
+            pass
 
-    try:
+    with patch.dict('sys.modules', {
+        'keyring': FakeKeyring(), 'keyring.errors': FakeKeyringErrMod(),
+    }):
         yield
-    finally:
-        if real_keyring is None:
-            del sys.modules['keyring']
-        else:
-            sys.modules['keyring'] = real_keyring
 
 pypirc2 = """
 [distutils]