Merge pull request #582 from takluyver/patch-1

Let devpi fall back to other options if keyring fails
jaraco · Jul 14, 2022 · 278c108 · 278c108
2 parents e960542 + 314c8d3
commit 278c108
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,8 @@
+v23.7.0
+-------
+
+* #582: Suppress KeyringErrors for devpi client.
+
 v23.6.0
 -------
 

diff --git a/keyring/devpi_client.py b/keyring/devpi_client.py
@@ -1,11 +1,19 @@
+import contextlib
+
 from pluggy import HookimplMarker
 
 import keyring
+from keyring.errors import KeyringError
 
 
 hookimpl = HookimplMarker("devpiclient")
 
 
+# https://github.com/jaraco/jaraco.context/blob/c3a9b739/jaraco/context.py#L205
+suppress = type('suppress', (contextlib.suppress, contextlib.ContextDecorator), {})
+
+
 @hookimpl()
+@suppress(KeyringError)
 def devpiclient_get_password(url, username):
     return keyring.get_password(url, username)