1
=== modified file 'NEWS.rst'
2
--- NEWS.rst	2020-04-14 11:29:16 +0000
3
+++ NEWS.rst	2020-04-17 01:53:49 +0000
4
@@ -2,6 +2,11 @@
5
2
NEWS for launchpadlib
2
NEWS for launchpadlib
6
3
=====================
3
=====================
7
4
4
8
5
1.10.12
9
6
=======
10
7
- Postpone keyring.errors import in the same way that we postpone importing
11
8
  keyring itself.
12
9
13
5
1.10.11 (2020-04-14)
10
1.10.11 (2020-04-14)
14
6
====================
11
====================
15
7
- Don't store credentials or open a browser window when running under sudo.
12
- Don't store credentials or open a browser window when running under sudo.
16
8
13
17
=== modified file 'src/launchpadlib/credentials.py'
18
--- src/launchpadlib/credentials.py	2020-04-13 20:40:37 +0000
19
+++ src/launchpadlib/credentials.py	2020-04-17 01:53:49 +0000
20
@@ -41,10 +41,6 @@
21
41
from sys import stdin
41
from sys import stdin
22
42
import time
42
import time
23
43
try:
43
try:
24
44
    from keyring.errors import NoKeyringError
25
45
except ImportError:
26
46
    NoKeyringError = RuntimeError
27
47
try:
28
48
    from urllib.parse import urlencode
44
    from urllib.parse import urlencode
29
49
except ImportError:
45
except ImportError:
30
50
    from urllib import urlencode
46
    from urllib import urlencode
31
@@ -381,6 +377,12 @@
32
381
        if 'keyring' not in globals():
377
        if 'keyring' not in globals():
33
382
            global keyring
378
            global keyring
34
383
            import keyring
379
            import keyring
35
380
        if 'NoKeyringError' not in globals():
36
381
            global NoKeyringError
37
382
            try:
38
383
                from keyring.errors import NoKeyringError
39
384
            except ImportError:
40
385
                NoKeyringError = RuntimeError
41
384
386
42
385
    def do_save(self, credentials, unique_key):
387
    def do_save(self, credentials, unique_key):
43
386
        """Store newly-authorized credentials in the keyring."""
388
        """Store newly-authorized credentials in the keyring."""
44
387
389
45
=== modified file 'src/launchpadlib/testing/helpers.py'
46
--- src/launchpadlib/testing/helpers.py	2011-01-10 14:34:03 +0000
47
+++ src/launchpadlib/testing/helpers.py	2020-04-17 01:53:49 +0000
48
@@ -133,10 +133,12 @@
49
133
    # The real keyring package should never be imported during tests.
133
    # The real keyring package should never be imported during tests.
50
134
    assert_keyring_not_imported()
134
    assert_keyring_not_imported()
51
135
    launchpadlib.credentials.keyring = fake
135
    launchpadlib.credentials.keyring = fake
52
136
    launchpadlib.credentials.NoKeyringError = RuntimeError
53
136
    try:
137
    try:
54
137
        yield
138
        yield
55
138
    finally:
139
    finally:
56
139
        del launchpadlib.credentials.keyring
140
        del launchpadlib.credentials.keyring
57
141
        del launchpadlib.credentials.NoKeyringError
58
140
142
59
141
143
60
142
class FauxSocketModule:
144
class FauxSocketModule:
Status:	Merged
Merged at revision:	180
Proposed branch:	lp:~cjwatson/launchpadlib/postpone-keyring-errors-import
Merge into:	lp:launchpadlib
Diff against target:	60 lines (+13/-4) 3 files modified NEWS.rst (+5/-0) src/launchpadlib/credentials.py (+6/-4) src/launchpadlib/testing/helpers.py (+2/-0)
To merge this branch:	bzr merge lp:~cjwatson/launchpadlib/postpone-keyring-errors-import
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
William Grant	code	2020-04-17	Approve on 2020-04-17
Review via email: mp+382465@code.launchpad.net