William Grant has proposed merging lp:~wgrant/launchpad/xenial-fixes-1 into
lp:launchpad.
Commit message:
Various fixes for Python 2.7.12.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~wgrant/launchpad/xenial-fixes-1/+merge/306300
Various fixes for Python 2.7.12.
This resolves most of the Python compatibility issues with Xenial. There'll be
separate branches for PostgreSQL 9.5, GnuPG 2 and modern apt.
--
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~wgrant/launchpad/xenial-fixes-1 into lp:launchpad.
=== modified file 'Makefile'
--- Makefile 2016-09-14 11:13:06 +
+++ Makefile 2016-09-21 04:32:55 +
@@ -1,8 +1,7 @@
# This file modified from Zope3/Makefile
# Licensed under the ZPL, (c) Zope Corporation and contributors.
-PYTHON:=$(shell sed -e \
-'/RELEASE/!d; s/.*=1[234].*/python2.7/; s/.*=.*/python2.6/' /etc/lsb-release)
+PYTHON:=python2.7
WD:=$(shell pwd)
PY=$(WD)/bin/py
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt 2012-12-26 01:32:19 +
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt 2016-09-21 04:32:55 +
@@ -52,8 +52,8 @@
the XML-RPC transport.
>>> test_transport.cookie_processor.cookiejar
-
+<...CookieJar[Cookie(version=0, name='Bugzilla_login'...),
+ Cookie(version=0, name='Bugzilla_logincookie'...)]>
Trying to log in to a Bugzilla instance for which we have no credentials
will raise an error:
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt 2016-07-04 17:08:29 +
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt 2016-09-21 04:32:55 +
@@ -79,8 +79,8 @@
the XML-RPC transport.
>>> test_transport.cookie_processor.cookiejar
-
+<...CookieJar[Cookie(version=0, name='Bugzilla_login'...),
+ Cookie(version=0, name='Bugzilla_logincookie'...)]>
The externalbugtracker.bugzilla module contains a decorator,
needs_authentication, which can be used to ensure that a
=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt'
--- lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt 2016-07-04 17:08:29 +
+++ lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt 2016-09-21 04:32:55 +
@@ -90,7 +90,7 @@
auth_cookie attribute set.
>>> test_transport.cookie_processor.cookiejar
->> trac._cookie_jar
->> trac._cookie_jar.set_cookie(new_cookie)
>>> trac._cookie_jar
-
>>> test_transport.cookie_processor.cookiejar
-
If authentication fails, a BugTrackerAuthenticationError will be raised.
=== modified file 'lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt'
--- lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt 2012-05-02 17:34:42 +
+++ lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt 2016-09-21 04:32:55 +
@@ -44,7 +44,7 @@
The Bugzilla_logincookie will now have been set for the transport, too.
>>> print bugzilla_transport.cookie_processor.cookiejar
-,
+<...CookieJar[,
]>
Trying to log in with an incorrect username or password will result in
=== modified file 'lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt'
--- lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt 2012-05-02 16:10:21 +
+++ lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt 2016-09-21 04:32:55 +
@@ -91,7 +91,7 @@
The login cookies are in the transport's cookie jar.
>>> print bugzilla_transport.cookie_processor.cookiejar
-,
+<...CookieJar[,
]>
=== modified file 'lib/lp/bugs/tests/externalbugtracker-xmlrpc-transport.txt'
--- lib/lp/bugs/tests/externalbugtracker-xmlrpc-transport.txt 2013-04-04 02:55:31 +
+++ lib/lp/bugs/tests/externalbugtracker-xmlrpc-transport.txt 2016-09-21 04:32:55 +
@@ -30,7 +30,7 @@
Before sending the request, the transport's cookie jar is empty.
>>> transport.cookie_processor.cookiejar
-
+<...CookieJar[]>
>>> request_body = """
...
@@ -51,13 +51,13 @@
contains the 'foo=bar' cookie sent by the server.
>>> transport.cookie_processor.cookiejar
-
+<...CookieJar[Cookie(version=0, name='foo', value='bar'...)]>
In addition to cookies sent by the server, we can set cookies locally.
>>> transport.setCookie('ding=dong')
>>> transport.cookie_processor.cookiejar
-
If an error occurs trying to make the request, an
=== modified file 'lib/lp/services/mail/doc/sending-mail.txt'
--- lib/lp/services/mail/doc/sending-mail.txt 2015-10-01 10:25:19 +
+++ lib/lp/services/mail/doc/sending-mail.txt 2016-09-21 04:32:55 +
@@ -194,7 +194,7 @@
... to_addrs='t...@canonical.com',
... subject=u'Subject',
... body=u'Content')
-'20...launchpad@...'
+'...launchpad@...'
>>> simple_sendmail(
... from
