Merge lp:~jelmer/launchpad/693757-py2.7-compat into lp:launchpad

[Jelmer Vernooij]

[r=bac,jcsackett][ui=none][bug=693757] Fix python2.7 compatibility of nascentupload-announcements.txt.

Python 2.7 changed the characters that are used to separate addresses in email fields. This breaks the nascentupload-announcements.txt doc test, which relies on the behaviour of the previous versions of Python.

This patch adds a convenience function for pretty printing the address list, which strips out the separator characters.

== Tests ==

./bin/test -t nascentupload-announcements.txt

[j.c.sackett (jcsackett)]

Jelmer--

This look straightforward and good to land.

The file is really out of date for our standards though (lint sees problems with indentation, headers &c). I won't require changes to pass review, but it would be awesome if you could update the file.

As I'm training, someone else will have to follow this up. I'll go ahead and hunt that down now.

review: Approve (code*)

[Brad Crittenden (bac)]

Jelmer I agree with Jon that this is a nice branch. Thanks to you both.

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/tests/nascentupload-announcements.txt'
--- lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2010-12-22 20:46:21 +0000
+++ lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2010-12-23 12:23:56 +0000
@@ -39,9 +39,14 @@
 Helper functions to examine emails that were sent:
 
   >>> from lp.services.mail import stub
+  >>> from lp.testing.mail_helpers import pop_notifications
+
   >>> def by_to_addrs(a, b):
   ...     return cmp(a[1], b[1])
-  >>> from lp.testing.mail_helpers import pop_notifications
+
+  >>> def print_addrlist(field):
+  ...    for entry in field.split(','):
+  ...        print entry.strip()
 
 Import the test keys to use 'insecure' policy.
 
@@ -105,8 +110,8 @@
   >>> notification['Subject']
   '[ubuntu/hoary] bar 1.0-1 (New)'
 
-  >>> notification['To']
-  'Daniel Silverstone <[e-mail]>'
+  >>> print_addrlist(notification['To'])
+  Daniel Silverstone <[e-mail]>
 
 Let's ACCEPT bar sources in order to make the next uploads of this
 series *known* in hoary:
@@ -152,8 +157,8 @@
   >>> notification['X-Katie']
   'Launchpad actually'
 
-  >>> notification['To']
-  'Daniel Silverstone <[e-mail]>'
+  >>> print_addrlist(notification['To'])
+  Daniel Silverstone <[e-mail]>
 
 Upload notifications from primary archive do not contain the
 'X-Launchpad-PPA' header, since it doesn't apply to this context.
@@ -277,8 +282,8 @@
   >>> notification['X-Katie']
   'Launchpad actually'
 
-  >>> notification['To']
-  'Foo Bar <[e-mail]>'
+  >>> print_addrlist(notification['To'])
+  Foo Bar <[e-mail]>
 
 On PPA upload notifications the 'X-Launchpad-PPA' is present and
 contains the target PPA owner account name.
@@ -435,8 +440,9 @@
   >>> notification['X-Katie']
   'Launchpad actually'
 
-  >>> notification['To']
-  'Foo Bar <[e-mail]>,\n\tDaniel Silverstone <[e-mail]>'
+  >>> print_addrlist(notification['To'])
+  Foo Bar <[e-mail]>
+  Daniel Silverstone <[e-mail]>
 
   >>> notification['Subject']
   '[ubuntu/hoary-updates] bar 1.0-2 (Waiting for approval)'
@@ -464,8 +470,9 @@
   >>> notification['X-Katie']
   'Launchpad actually'
 
-  >>> notification['To']
-  'Foo Bar <[e-mail]>,\n\tDaniel Silverstone <[e-mail]>'
+  >>> print_addrlist(notification['To'])
+  Foo Bar <[e-mail]>
+  Daniel Silverstone <[e-mail]>
 
   >>> notification['Subject']
   '[ubuntu/hoary-backports] bar 1.0-3 (Waiting for approval)'
@@ -515,8 +522,8 @@
   >>> notification['X-Katie']
   'Launchpad actually'
 
-  >>> notification['To']
-  'Celso Providelo <[e-mail]>'
+  >>> print_addrlist(notification['To'])
+  Celso Providelo <[e-mail]>
 
   >>> notification['Subject']
   '[ubuntu/hoary-backports] bar 1.0-4 (Accepted)'
@@ -814,8 +821,8 @@
   >>> notification['X-Katie']
   'Launchpad actually'
 
-  >>> notification['To']
-  'Daniel Silverstone <[e-mail]>'
+  >>> print_addrlist(notification['To'])
+  Daniel Silverstone <[e-mail]>
 
 Remove the misnamed changes file copy used for testing.