launchpadlib

Merge lp:~jameinel/launchpadlib/py27-config-ordering-1020667 into lp:launchpadlib

  1. py27-config-ordering-1020667
  2. Merge into trunk
Proposed by John A Meinel
Status: Merged
Approved by: j.c.sackett
Approved revision: 133
Merged at revision: 133
Proposed branch: lp:~jameinel/launchpadlib/py27-config-ordering-1020667
Merge into: lp:launchpadlib
Diff against target: 37 lines (+7/-1)
3 files modified
src/launchpadlib/NEWS.txt (+5/-0)
src/launchpadlib/__init__.py (+1/-1)
src/launchpadlib/docs/introduction.txt (+1/-0)
To merge this branch: bzr merge lp:~jameinel/launchpadlib/py27-config-ordering-1020667
Reviewer Review Type Date Requested Status
j.c.sackett (community) Approve
Review via email: mp+113558@code.launchpad.net

Commit message

Fix the doctest update, release 1.10.2

Description of the change

This is a small tweak to my doctest fix that I proposed yesterday. I had thought the fix straightforward, but missed a seek().

It also turns out that the 1.10.0 patch to allow "disable_ssl_certificate" checking requires a newer httplib than we are using in Launchpad (it was causing other failures in the same doctest).

So I have a branch of Launchpad that proposes updating both launchpadlib to 1.10.2 (after this lands), and httplib2-0.7.4 (which includes the ssl certificate being passed).

(But I can't really land that branch until 1.10.2 is actually available. :)

To post a comment you must log in.
Revision history for this message
j.c.sackett (jcsackett) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/launchpadlib/NEWS.txt'
2--- src/launchpadlib/NEWS.txt 2012-07-04 15:08:34 +0000
3+++ src/launchpadlib/NEWS.txt 2012-07-05 11:57:21 +0000
4@@ -2,6 +2,11 @@
5 NEWS for launchpadlib
6 =====================
7
8+1.10.2 (2012-07-05)
9+===================
10+- Typo in the doctest fix, discovered when trying to integrate with launchpad
11+ itself. [bug=1020667]
12+
13 1.10.1 (2012-07-04)
14 ===================
15 - Fix a doctest in introduction.txt so that the test suite runs with
16
17=== modified file 'src/launchpadlib/__init__.py'
18--- src/launchpadlib/__init__.py 2012-07-04 15:08:34 +0000
19+++ src/launchpadlib/__init__.py 2012-07-05 11:57:21 +0000
20@@ -14,4 +14,4 @@
21 # You should have received a copy of the GNU Lesser General Public License
22 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
23
24-__version__ = '1.10.1'
25+__version__ = '1.10.2'
26
27=== modified file 'src/launchpadlib/docs/introduction.txt'
28--- src/launchpadlib/docs/introduction.txt 2012-07-04 11:40:36 +0000
29+++ src/launchpadlib/docs/introduction.txt 2012-07-05 11:57:21 +0000
30@@ -126,6 +126,7 @@
31 >>> encrypted_file = StringIO()
32 >>> stream = EncodedFile(encrypted_file, 'rot_13', 'ascii')
33 >>> credentials.save(stream)
34+ >>> stream.seek(0, 0)
35 >>> print ''.join(sorted(encrypted_file))
36 [1]
37 <BLANKLINE>

Subscribers

People subscribed via source and target branches