launchpad-reviewers team mailing list archive

[Deryck Hodge <deryck.hodge@xxxxxxxxxxxxx>]

Deryck Hodge has proposed merging lp:~deryck/launchpad/reauth-email-new-python-openid into lp:launchpad with lp:~deryck/launchpad/reauth-for-email-363916 as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1034376 in Launchpad itself: "Unable to see private branch contents on https://bazaar.launchpad.net";
  https://bugs.launchpad.net/launchpad/+bug/1034376

For more details, see:
https://code.launchpad.net/~deryck/launchpad/reauth-email-new-python-openid/+merge/119167

This updates our python-openid to a patched version of our own making.  This patched version contains wrant's fix for codehosting.  (I'm self approving since it's a small, safe change.)
-- 
https://code.launchpad.net/~deryck/launchpad/reauth-email-new-python-openid/+merge/119167
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~deryck/launchpad/reauth-email-new-python-openid into lp:launchpad.

=== modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
--- lib/lp/registry/stories/mailinglists/subscriptions.txt	2012-08-08 13:43:52 +0000
+++ lib/lp/registry/stories/mailinglists/subscriptions.txt	2012-08-10 17:49:21 +0000
@@ -100,7 +100,12 @@
 However, testing-spanish-team's list doesn't show up because its creation has
 not been completed (specifically, Mailman hasn't constructed it yet).
 
+<<<<<<< TREE
     >>> browser.getControl(name='field.subscription.testing-spanish-team')
+=======
+    >>> carlos_browser.getControl(
+    ...     name='field.subscription.testing-spanish-team')
+>>>>>>> MERGE-SOURCE
     Traceback (most recent call last):
     ...
     LookupError: name 'field.subscription.testing-spanish-team'
@@ -393,7 +398,12 @@
     >>> print browser.title
     Mailing list subscribers for the Rosetta Administrators team...
 
+<<<<<<< TREE
     >>> print extract_text(find_tag_by_id(browser.contents, 'subscribers'))
+=======
+    >>> print extract_text(
+    ...     find_tag_by_id(carlos_browser.contents, 'subscribers'))
+>>>>>>> MERGE-SOURCE
     Nobody has subscribed to this team's mailing list yet.
 
 If it had subscribers, though, they'd be shown on that page, in a batched
@@ -420,14 +430,26 @@
     >>> ignored = rosetta_admins.addMember(jordi, reviewer=mark)
     >>> rosetta_admins.mailing_list.subscribe(jordi)
     >>> logout()
+<<<<<<< TREE
     >>> browser.reload()
     >>> print extract_text(find_tag_by_id(browser.contents, 'subscribers'))
+=======
+    >>> carlos_browser.reload()
+    >>> print extract_text(
+    ...     find_tag_by_id(carlos_browser.contents, 'subscribers'))
+>>>>>>> MERGE-SOURCE
     The following people are subscribed...
     Guilherme Salgado
     1 of 2 results...
 
+<<<<<<< TREE
     >>> browser.getLink('Next').click()
     >>> print extract_text(find_tag_by_id(browser.contents, 'subscribers'))
+=======
+    >>> carlos_browser.getLink('Next').click()
+    >>> print extract_text(
+    ...    find_tag_by_id(carlos_browser.contents, 'subscribers'))
+>>>>>>> MERGE-SOURCE
     The following people are subscribed...
     Jordi Mallach
     2 of 2 results...

=== modified file 'versions.cfg'
--- versions.cfg	2012-08-08 13:41:05 +0000
+++ versions.cfg	2012-08-10 17:49:21 +0000
@@ -100,9 +100,16 @@
 # python setup.py egg_info -bDEV-r`bzr revno` sdist
 # mv dist/python-memcached-1.49DEV-r57.tar.gz [LOCATION]/download-cache/dist
 python-memcached = 1.49DEV-r57
+<<<<<<< TREE
 # 2.2.1 with the one-liner Expect: 100-continue fix from
 # lp:~wgrant/python-openid/python-openid-2.2.1-fix676372.
 python-openid = 2.2.1-fix676372
+=======
+# XXX: deryck 2012-08-10
+# See lp:~deryck/python-openid/python-openid-fix1034376 which
+# reapplied a patch from wgrant to get codehosting going again.
+python-openid = 2.2.5-fix1034376
+>>>>>>> MERGE-SOURCE
 python-subunit = 0.0.8beta
 pytz = 2012c
 rdflib = 3.1.0