Merge lp:~cjwatson/launchpadlib/postpone-keyring-errors-import into lp:launchpadlib

[Colin Watson]

Postpone keyring.errors import.

We import the keyring module late because it does environment-dependent backend initialisation at import time, and we want to postpone this until we actually need it; importing it early can also cause test problems. We need to take the same care when importing keyring.errors.

I think this will fix failures on Ubuntu's autopkgtest runners (e.g. https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/amd64/p/python-launchpadlib/20200415_171509_0c21d@/log.gz).

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'NEWS.rst'
--- NEWS.rst	2020-04-14 11:29:16 +0000
+++ NEWS.rst	2020-04-17 01:53:49 +0000
@@ -2,6 +2,11 @@
 NEWS for launchpadlib
 =====================
 
+1.10.12
+=======
+- Postpone keyring.errors import in the same way that we postpone importing
+  keyring itself.
+
 1.10.11 (2020-04-14)
 ====================
 - Don't store credentials or open a browser window when running under sudo.

=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2020-04-13 20:40:37 +0000
+++ src/launchpadlib/credentials.py	2020-04-17 01:53:49 +0000
@@ -41,10 +41,6 @@
 from sys import stdin
 import time
 try:
-    from keyring.errors import NoKeyringError
-except ImportError:
-    NoKeyringError = RuntimeError
-try:
     from urllib.parse import urlencode
 except ImportError:
     from urllib import urlencode
@@ -381,6 +377,12 @@
         if 'keyring' not in globals():
             global keyring
             import keyring
+        if 'NoKeyringError' not in globals():
+            global NoKeyringError
+            try:
+                from keyring.errors import NoKeyringError
+            except ImportError:
+                NoKeyringError = RuntimeError
 
     def do_save(self, credentials, unique_key):
         """Store newly-authorized credentials in the keyring."""

=== modified file 'src/launchpadlib/testing/helpers.py'
--- src/launchpadlib/testing/helpers.py	2011-01-10 14:34:03 +0000
+++ src/launchpadlib/testing/helpers.py	2020-04-17 01:53:49 +0000
@@ -133,10 +133,12 @@
     # The real keyring package should never be imported during tests.
     assert_keyring_not_imported()
     launchpadlib.credentials.keyring = fake
+    launchpadlib.credentials.NoKeyringError = RuntimeError
     try:
         yield
     finally:
         del launchpadlib.credentials.keyring
+        del launchpadlib.credentials.NoKeyringError
 
 
 class FauxSocketModule: