Merge lp:~leonardr/launchpadlib/fix-for-martin into lp:launchpadlib

Proposed by Leonard Richardson
Status: Merged
Approved by: Brad Crittenden
Approved revision: 106
Merge reported by: Leonard Richardson
Merged at revision: not available
Proposed branch: lp:~leonardr/launchpadlib/fix-for-martin
Merge into: lp:launchpadlib
Diff against target: 50 lines (+8/-2)
4 files modified
buildout.cfg (+1/-1)
src/launchpadlib/NEWS.txt (+5/-0)
src/launchpadlib/__init__.py (+1/-1)
src/launchpadlib/launchpad.py (+1/-0)
To merge this branch: bzr merge lp:~leonardr/launchpadlib/fix-for-martin
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+45540@code.launchpad.net

Description of the change

This branch adds an import to fix a failure reported by Martin Pitt here: https://bugs.launchpad.net/launchpadlib/+bug/686690/comments/27

The failure happens in pretty much the only line of code in the Launchpad class we can't test automatically, so there's no test, but I did test it manually.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2010-10-21 19:30:17 +0000
3+++ buildout.cfg 2011-01-07 18:05:44 +0000
4@@ -14,7 +14,7 @@
5 defaults = '--tests-pattern ^tests --exit-with-status'.split()
6
7 [interpreter]
8-recipe = zc.recipe.egg
9+recipe = z3c.recipe.scripts
10 interpreter = py
11 eggs = launchpadlib
12 docutils
13
14=== modified file 'src/launchpadlib/NEWS.txt'
15--- src/launchpadlib/NEWS.txt 2011-01-06 13:43:40 +0000
16+++ src/launchpadlib/NEWS.txt 2011-01-07 18:05:44 +0000
17@@ -2,6 +2,11 @@
18 NEWS for launchpadlib
19 =====================
20
21+1.9.2 (2011-01-07)
22+==================
23+
24+- Added a missing import.
25+
26 1.9.1 (2011-01-06)
27 ==================
28
29
30=== modified file 'src/launchpadlib/__init__.py'
31--- src/launchpadlib/__init__.py 2011-01-06 13:43:40 +0000
32+++ src/launchpadlib/__init__.py 2011-01-07 18:05:44 +0000
33@@ -14,4 +14,4 @@
34 # You should have received a copy of the GNU Lesser General Public License
35 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
36
37-__version__ = '1.9.1'
38+__version__ = '1.9.2'
39
40=== modified file 'src/launchpadlib/launchpad.py'
41--- src/launchpadlib/launchpad.py 2011-01-04 19:21:31 +0000
42+++ src/launchpadlib/launchpad.py 2011-01-07 18:05:44 +0000
43@@ -35,6 +35,7 @@
44 from launchpadlib.credentials import (
45 AccessToken,
46 AnonymousAccessToken,
47+ AuthorizeRequestTokenWithBrowser,
48 Consumer,
49 Credentials,
50 KeyringCredentialStore,

Subscribers

People subscribed via source and target branches