Merge lp:~salgado/launchpad/python2.5-and-2.6 into lp:launchpad

[Guilherme Salgado]

Make sure the test suite passes on both python2.5 and python2.6.

[Gary Poster (gary)]

merge-conditional

Woohoo!

Edited IRC transcript.

[09:47am] maxb: salgado: Perhaps the DeprecationWarning suppressions that are stopgap measures should all be XXXed before being allowed into trunk?
[09:59am] salgado: maxb, yeah, definitely. I'll do that
[10:02am] gary_poster: maxb, salgado +1. I also wondered if importfascist (or landscape's reimplementation) could somehow not have the behavior you described, but my only interest right now is maybe mentioning this in a bug report as a way to better focus the deprecation warnings again. I don't want to spend time right now thinking about whether that's even possible. Of course, if you know already that it is not possible, nm
[10:06am] gary_poster: salgado, generally would like to see bugs for all of the new XXXs (the py 2.5 hacks in particular--I suggest that they could all be grouped together)
[10:11am] gary_poster: salgado: looking at lines 276-281 of the diff. In lib/lp/bugs/tests/bugs-emailinterface.txt you deleted the following:
[10:11am] gary_poster: -This does not affect the processing. Note though that the filename from
[10:11am] gary_poster: -the content-type header is ignored, even if the content-disposition
[10:11am] gary_poster: -header does not provide a filename.
[10:11am] gary_poster: Is that because in Python 2.6 we now honor the content-type filename?
[10:12am] salgado: gary_poster, yes, and since that doesn't seem to be important to us I've changed the test to not mention it and elide the thing
[10:12am] gary_poster: cool
[10:13am] salgado: gary_poster, I was thinking of having just one bug for the python2.5 hacks left behind
[10:14am] gary_poster: good, yes
[10:15am] gary_poster: salgado: you have this XXX on line 394 of the diff (in lib/lp/services/mailman/doc/deactivate-lists.txt) but not on line 196 (in lib/canonical/launchpad/tests/test_helpers.py). I don't have a strong feeling abot whether it is necessary, but we ought to be consistent. My inclination is to have it be another Python 2.5 XXX.
[10:15am] gary_poster: # XXX: The .rstrip('/') is to make this pass on python2.5 and 2.6.
[10:16am] gary_poster: Actually you are consistent in other places, so it just looks like an oversight that the one in test_helpers.py doesn't have an XXX
[10:16am] salgado: yeah, I missed that
[10:22am] gary_poster: salgado: last topic is that I was looking at mwhudson's bug/hack (https://bugs.edge.launchpad.net/launchpad-code/+bug/564375). The thing I don't see is the proper fix. Is the proper fix in Python's HttpServer? If so, have we made a bug in the Python bug tracker? If not...what do we need to change in the future? If you are not sure, I won't let this keep you from landing, but I would like you and/or mwhudson to follow up in that regard.
[10:25am] salgado: I'm not sure, but I'll comment on the bug asking what the proper fix would be, if that's ok with you
[10:27am] maxb: The proper fix would be for SocketServer to provide a documented way of breaking it out of its select loop
[10:28am] gary_poster: that makes sense, maxb--which would be a Python bug. thanks salgado, yes.

review: Approve

=== modified file 'buildout-templates/_pythonpath.py.in'
--- buildout-templates/_pythonpath.py.in	2010-04-20 19:10:35 +0000
+++ buildout-templates/_pythonpath.py.in	2010-04-27 20:46:29 +0000
@@ -12,7 +12,13 @@
 
 import os
 import sys
+import warnings
 
+# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
+# warnings.
+warnings.filterwarnings(
+    'ignore', '.*(md5|sha|sets)', DeprecationWarning,
+    )
 
 site_dir = ${scripts:parts-directory|path-repr}
 
 
=== modified file 'buildout-templates/bin/test.in'
--- buildout-templates/bin/test.in	2010-04-20 19:10:35 +0000
+++ buildout-templates/bin/test.in	2010-04-27 20:46:29 +0000
@@ -98,7 +98,7 @@
 # need to be silenced should have an accompanied Bug reference.
 #
 warnings.filterwarnings(
-    'ignore', 'PyCrypto', RuntimeWarning, 'twisted[.]conch[.]ssh'
+    'ignore', 'PyCrypto', RuntimeWarning, 'twisted[.]conch[.]ssh',
     )
 warnings.filterwarnings(
     'ignore', 'twisted.python.plugin', DeprecationWarning,
@@ -107,8 +107,19 @@
     'ignore', 'zope.testing.doctest', DeprecationWarning,
     )
 warnings.filterwarnings(
-    'ignore', 'bzrlib.*was deprecated', DeprecationWarning
-)
+    'ignore', 'bzrlib.*was deprecated', DeprecationWarning,
+    )
+# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
+# warnings.
+# We cannot narrow this warnings filter to just twisted because
+# warnings.warn_explicit() sees this import as coming from importfascist, not
+# from twisted.  It makes no sense to put module='importfascist' here though
+# because /everything/ gets imported through it.  So, sad as it is, until
+# twisted doesn't produce warnings under Python 2.6, just ignore all these
+# deprecations.
+warnings.filterwarnings(
+    'ignore', '.*(md5|sha|sets)', DeprecationWarning,
+    )
 # The next one is caused by a lamosity in python-openid.  The following change
 # to openid/server/server.py would make the warning filter unnecessary:
 # 978c974,974
 
=== modified file 'ez_setup.py'
--- ez_setup.py	2009-05-31 22:17:45 +0000
+++ ez_setup.py	2010-04-27 20:46:29 +0000
@@ -3,7 +3,6 @@
 # NOTE TO LAUNCHPAD DEVELOPERS: This is a bootstrapping file from the
 # setuptools project.  It is imported by our setup.py.
 
-#!python
 """Bootstrap setuptools installation
 
 If you want to use setuptools in your package's setup.py, just include this
@@ -19,7 +18,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c9"
+DEFAULT_VERSION = "0.6c11"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
@@ -33,6 +32,14 @@
     'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
     'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
     'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+    'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
+    'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
+    'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
+    'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
+    'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
+    'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
+    'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
+    'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
     'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
     'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
     'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
@@ -97,7 +104,7 @@
     try:
         import pkg_resources
     except ImportError:
-        return do_download()       
+        return do_download()
     try:
         pkg_resources.require("setuptools>="+version); return
     except pkg_resources.VersionConflict, e:
@@ -278,3 +285,4 @@
 
 
 
+
 
=== modified file 'lib/canonical/buildd/tests/test_generate_translation_templates.py'
--- lib/canonical/buildd/tests/test_generate_translation_templates.py	2010-03-18 13:27:47 +0000
+++ lib/canonical/buildd/tests/test_generate_translation_templates.py	2010-04-27 20:46:29 +0000
@@ -92,7 +92,7 @@
             os.path.dirname(__file__),'dummy_templates.tar.gz')
         tar = tarfile.open(dummy_tar, 'r|*')
         tar.extractall(branchdir)
-        potnames = [name for name in tar.getnames() if not name.endswith('/')]
+        potnames = [member.name for member in tar.getmembers() if not member.isdir()]
         tar.close()
 
         generator = GenerateTranslationTemplates(
 
=== modified file 'lib/canonical/database/ftests/script_isolation.py'
--- lib/canonical/database/ftests/script_isolation.py	2009-08-13 15:12:16 +0000
+++ lib/canonical/database/ftests/script_isolation.py	2010-04-27 20:46:29 +0000
@@ -8,6 +8,14 @@
 __metaclass__ = type
 __all__ = []
 
+import warnings
+
+# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
+# warnings.
+warnings.filterwarnings(
+    'ignore', '.*(md5|sha|sets)', DeprecationWarning,
+    )
+
 from canonical.database.sqlbase import cursor, ISOLATION_LEVEL_SERIALIZABLE
 from canonical.launchpad.scripts import execute_zcml_for_scripts
 from canonical.lp import initZopeless
 
=== modified file 'lib/canonical/launchpad/daemons/tachandler.py'
--- lib/canonical/launchpad/daemons/tachandler.py	2010-04-05 09:22:54 +0000
+++ lib/canonical/launchpad/daemons/tachandler.py	2010-04-27 20:46:29 +0000
@@ -128,7 +128,13 @@
         remove_if_exists(self.logfile)
 
         self.setUpRoot()
-        args = [sys.executable, twistd_script, '-o', '-y', self.tacfile,
+        args = [sys.executable,
+                # XXX: 2010-04-26, Salgado, bug=570246: Deprecation warnings
+                # in Twisted are not our problem.  They also aren't easy to
+                # suppress, and cause test failures due to spurious stderr
+                # output.  Just shut the whole bloody mess up.
+                '-Wignore::DeprecationWarning',
+                twistd_script, '-o', '-y', self.tacfile,
                 '--pidfile', self.pidfile, '--logfile', self.logfile]
         if spew:
             args.append('--spew')
 
=== modified file 'lib/canonical/launchpad/doc/gpghandler.txt'
--- lib/canonical/launchpad/doc/gpghandler.txt	2010-04-20 21:20:43 +0000
+++ lib/canonical/launchpad/doc/gpghandler.txt	2010-04-27 20:46:29 +0000
@@ -332,7 +332,7 @@
     Traceback (most recent call last):
     ...
     GPGUploadFailure: Could not reach keyserver at
-    http://localhost:11371 (111, 'Connection refused')
+    http://localhost:11371...Connection refused...
 
 
 == Fingerprint sanitizing ==
 
=== modified file 'lib/canonical/launchpad/doc/incomingmail.txt'
--- lib/canonical/launchpad/doc/incomingmail.txt	2010-03-02 14:37:56 +0000
+++ lib/canonical/launchpad/doc/incomingmail.txt	2010-04-27 20:46:29 +0000
@@ -360,7 +360,7 @@
     >>> handleMail(transaction)
     ERROR:...:Upload to Librarian failed...
     ...
-    UploadFailed: [...]: (111, 'Connection refused')
+    UploadFailed: ...Connection refused...
 
     >>> len(stub.test_emails)
     2
 
=== modified file 'lib/canonical/launchpad/testing/googletestservice.py'
--- lib/canonical/launchpad/testing/googletestservice.py	2009-10-17 14:06:03 +0000
+++ lib/canonical/launchpad/testing/googletestservice.py	2010-04-27 20:46:29 +0000
@@ -125,7 +125,7 @@
             try:
                 sock.connect((host, port))
             except socket.error, err:
-                if err.args[0] == errno.ECONNREFUSED:
+                if err.args[0] in [errno.ECONNREFUSED, errno.ECONNABORTED]:
                     elapsed = (time.time() - start)
                     if elapsed > timeout:
                         raise RuntimeError("Socket poll time exceeded.")
 
=== modified file 'lib/canonical/launchpad/tests/test_helpers.py'
--- lib/canonical/launchpad/tests/test_helpers.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/tests/test_helpers.py	2010-04-27 20:46:29 +0000
@@ -55,8 +55,10 @@
 
     Check the expected files are in the archive.
 
-    >>> tarball.getnames()
-    ['test/', 'test/cy.po', 'test/es.po', 'test/test.pot']
+    # XXX: 2010-04-26, Salgado, bug=570244: This rstrip('/') is to make the
+    # test pass on python2.5 and 2.6.
+    >>> [name.rstrip('/') for name in tarball.getnames()]
+    ['test', 'test/cy.po', 'test/es.po', 'test/test.pot']
 
     Check the contents.
 
 
=== modified file 'lib/canonical/launchpad/utilities/gpghandler.py'
--- lib/canonical/launchpad/utilities/gpghandler.py	2010-04-20 18:55:06 +0000
+++ lib/canonical/launchpad/utilities/gpghandler.py	2010-04-27 20:46:29 +0000
@@ -160,7 +160,14 @@
             try:
                 signatures = ctx.verify(sig, plain, None)
             except gpgme.GpgmeError, e:
-                raise GPGVerificationError(e.message)
+                # XXX: 2010-04-26, Salgado, bug=570244: This hack is needed
+                # for python2.5 compatibility. We should remove it when we no
+                # longer need to run on python2.5.
+                if hasattr(e, 'message'):
+                    msg = e.message
+                else:
+                    msg = e.strerror
+                raise GPGVerificationError(msg)
         else:
             # store clearsigned signature
             sig = StringIO(content)
@@ -170,7 +177,14 @@
             try:
                 signatures = ctx.verify(sig, None, plain)
             except gpgme.GpgmeError, e:
-                raise GPGVerificationError(e.message)
+                # XXX: 2010-04-26, Salgado, bug=570244: This hack is needed
+                # for python2.5 compatibility. We should remove it when we no
+                # longer need to run on python2.5.
+                if hasattr(e, 'message'):
+                    msg = e.message
+                else:
+                    msg = e.strerror
+                raise GPGVerificationError(msg)
 
         # XXX jamesh 2006-01-31:
         # We raise an exception if we don't get exactly one signature.
 
=== modified file 'lib/canonical/launchpad/validators/url.py'
--- lib/canonical/launchpad/validators/url.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/validators/url.py	2010-04-27 20:46:29 +0000
@@ -21,8 +21,14 @@
     True
     >>> valid_absolute_url('http://www.example.com')
     True
-    >>> valid_absolute_url('whatever://example.com/blah')
+    >>> valid_absolute_url('whatever:/uxample.com/blah')
     False
+
+    # XXX: 2010-04-26, Salgado, bug=570244: This test only works against
+    # python2.6 but we still need to run on python2.5, so we should uncomment
+    # it only when we no longer need to run on 2.5.
+    >>> #valid_absolute_url('whatever://example.com/blah')
+    True
     """
     # Have to import urlparse locally since imports from helpers.py
     # causes this module to be imported, and we can't import stuff from
 
=== modified file 'lib/canonical/lazr/doc/timeout.txt'
--- lib/canonical/lazr/doc/timeout.txt	2008-06-23 12:15:18 +0000
+++ lib/canonical/lazr/doc/timeout.txt	2010-04-27 20:46:29 +0000
@@ -173,7 +173,7 @@
     >>> urlfetch(http_server_url)
     Traceback (most recent call last):
       ...
-    URLError: ...'Connection refused'...
+    URLError: ...Connection refused...
 
 After the listen() is called, connections will hang until accept() is
 called, so a TimeoutError will be raised.
 
=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2010-04-15 14:02:10 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2010-04-27 20:46:29 +0000
@@ -2776,10 +2776,8 @@
     this is not a real JPG file
 
 Some mail clients append a filename to the content type of attachments.
-This does not affect the processing. Note though that the filename from
-the content-type header is ignored, even if the content-disposition 
-header does not provide a filename. The content type of the PGP signature
-is properly detected and thus no bug attchement created.
+The content type of the PGP signature is properly detected and thus no bug
+attachment is created.
 
     >>> submit_mail = """From: Sample Person <[e-mail]>
     ... To: [e-mail]
@@ -2824,7 +2822,7 @@
     >>>
     >>> process_email(submit_mail)
     >>> print_attachments(get_latest_added_bug().attachments)
-    LibraryFileAlias unnamed image/jpeg; name="image.jpg" UNSPECIFIED
+    LibraryFileAlias ... image/jpeg; name="image.jpg" UNSPECIFIED
     this is not a real JPG file
     LibraryFileAlias sourcefile.diff text/x-diff; name="sourcefile1.diff" PATCH
     this should be diff output.
 
=== modified file 'lib/lp/codehosting/puller/tests/test_acceptance.py'
--- lib/lp/codehosting/puller/tests/test_acceptance.py	2010-04-15 01:30:39 +0000
+++ lib/lp/codehosting/puller/tests/test_acceptance.py	2010-04-27 20:46:29 +0000
@@ -8,6 +8,7 @@
 
 
 import os
+import socket
 from subprocess import PIPE, Popen
 import unittest
 
@@ -18,6 +19,8 @@
 from bzrlib.config import TransportConfig
 from bzrlib import errors
 from bzrlib.tests import HttpServer
+from bzrlib.tests.http_server import (
+    TestingHTTPServer, TestingThreadingHTTPServer)
 from bzrlib.transport import get_transport
 from bzrlib.upgrade import upgrade
 from bzrlib.urlutils import join as urljoin, local_path_from_url
@@ -33,6 +36,38 @@
 from canonical.testing import ZopelessAppServerLayer
 
 
+# XXX MichaelHudson, bug=564375: With changes to the SocketServer module in
+# Python 2.6 the thread created in serveOverHTTP cannot be joined, because
+# HttpServer.stop_server doesn't do enough to get the thread out of the select
+# call in SocketServer.BaseServer.handle_request().  So what follows is
+# slightly horrible code to use the version of handle_request from Python 2.5.
+
+def fixed_handle_request(self):
+    """Handle one request, possibly blocking. """
+    try:
+        request, client_address = self.get_request()
+    except socket.error:
+        return
+    if self.verify_request(request, client_address):
+        try:
+            self.process_request(request, client_address)
+        except:
+            self.handle_error(request, client_address)
+            self.close_request(request)
+
+
+class FixedTHS(TestingHTTPServer):
+    handle_request = fixed_handle_request
+
+
+class FixedTTHS(TestingThreadingHTTPServer):
+    handle_request = fixed_handle_request
+
+
+class FixedHttpServer(HttpServer):
+    http_server_class = {'HTTP/1.0': FixedTHS, 'HTTP/1.1': FixedTTHS}
+
+
 class TestBranchPuller(PullerBranchTestCase):
     """Integration tests for the branch puller.
 
@@ -135,7 +170,7 @@
 
     def serveOverHTTP(self):
         """Serve the current directory over HTTP, returning the server URL."""
-        http_server = HttpServer()
+        http_server = FixedHttpServer()
         http_server.start_server()
         # Join cleanup added before the tearDown so the tearDown is executed
         # first as this tells the thread to die.  We then join explicitly as
 
=== modified file 'lib/lp/poppy/daemon.py'
--- lib/lp/poppy/daemon.py	2010-03-17 12:26:14 +0000
+++ lib/lp/poppy/daemon.py	2010-04-27 20:46:29 +0000
@@ -9,11 +9,18 @@
     ]
 
 import optparse
+import warnings
 
 from canonical.launchpad.scripts import logger, logger_options
 from lp.poppy.hooks import Hooks
 from lp.poppy.server import run_server
 
+# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
+# warnings.
+warnings.filterwarnings(
+    'ignore', '.*(md5|sha|sets)', DeprecationWarning,
+    )
+
 
 def main():
     parser = optparse.OptionParser()
 
=== modified file 'lib/lp/services/mailman/doc/deactivate-lists.txt'
--- lib/lp/services/mailman/doc/deactivate-lists.txt	2009-06-23 19:33:57 +0000
+++ lib/lp/services/mailman/doc/deactivate-lists.txt	2010-04-27 20:46:29 +0000
@@ -42,7 +42,9 @@
     >>> import tarfile
     >>> tarball = tarfile.open(backup_file, 'r:gz')
     >>> for name in sorted(tarball.getnames()):
-    ...     print name
-    itest-one/
+    ...     # XXX: 2010-04-26, Salgado, bug=570244: The .rstrip('/') is to
+    ...     # make this pass on python2.5 and 2.6.
+    ...     print name.rstrip('/')
+    itest-one
     itest-one/config.pck
     itest-one/config.pck.last
 
=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt	2010-04-09 15:46:09 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt	2010-04-27 20:46:29 +0000
@@ -67,10 +67,10 @@
 builder and was reset due to a communication time-out.
 
     >>> builder_set.checkBuilders(logger, transaction)
-    WARNING:root:Resetting builder: http://localhost:9221/ -- (111, 'Connection refused')
+    WARNING:root:Resetting builder: http://localhost:9221/...Connection refused...
     Traceback (most recent call last):
     ...
-    error: (111, 'Connection refused')
+    error: ...Connection refused...
 
 The 'frog' builder was not marked as failed.
 
 
=== modified file 'lib/lp/soyuz/doc/buildd-slave.txt.disabled'
--- lib/lp/soyuz/doc/buildd-slave.txt.disabled	2010-04-03 03:38:55 +0000
+++ lib/lp/soyuz/doc/buildd-slave.txt.disabled	2010-04-27 20:46:29 +0000
@@ -94,4 +94,4 @@
   >>> s.info()
   Traceback (most recent call last):
   ...
-  error: (111, 'Connection refused')
+  error: ...Connection refused...
 
=== modified file 'lib/lp/soyuz/doc/manage-chroot.txt'
--- lib/lp/soyuz/doc/manage-chroot.txt	2009-04-28 12:59:43 +0000
+++ lib/lp/soyuz/doc/manage-chroot.txt	2010-04-27 20:46:29 +0000
@@ -193,6 +193,6 @@
     ... else:
     ...     print "Did not get expected exception"
     DEBUG   Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
-    Librarian upload failed: [...]: (111, 'Connection refused')
+    Librarian upload failed: ...Connection refused...
 
     >>> LibrarianLayer.reveal()
 
=== modified file 'lib/lp/translations/doc/poexport-language-pack.txt'
--- lib/lp/translations/doc/poexport-language-pack.txt	2009-11-17 09:50:33 +0000
+++ lib/lp/translations/doc/poexport-language-pack.txt	2010-04-27 20:46:29 +0000
@@ -55,7 +55,9 @@
     ...             size = 'bin'
     ...         else:
     ...             size = len(tarfile.extractfile(member).readlines())
-    ...         print "| %5s | %s" % (size, member.name)
+    ...         # XXX: 2010-04-26, Salgado, bug=570244: The .rstrip('/') is to
+    ...         # make this pass on python2.5 and 2.6.
+    ...         print "| %5s | %s" % (size, member.name.rstrip('/'))
 
 
 == Base language pack export using Librarian ==
@@ -92,12 +94,14 @@
 
 The tarball has the right members.
 
-    >>> for name in tarfile.getnames():
-    ...     print name
-    rosetta-hoary/
+    >>> for member in tarfile.getmembers():
+    ...     # XXX: 2010-04-26, Salgado, bug=570244: The .rstrip('/') is to
+    ...     # make this pass on python2.5 and 2.6.
+    ...     print member.name.rstrip('/')
+    rosetta-hoary
     ...
-    rosetta-hoary/es/
-    rosetta-hoary/es/LC_MESSAGES/
+    rosetta-hoary/es
+    rosetta-hoary/es/LC_MESSAGES
     rosetta-hoary/es/LC_MESSAGES/pmount.po
     ...
     rosetta-hoary/timestamp.txt
@@ -105,7 +109,12 @@
 
 Directory permissions allow correct use of those directories:
 
-    >>> directory = tarfile.getmember('rosetta-hoary/')
+    # XXX: 2010-04-26, Salgado, bug=570244: This try/except is needed to make
+    # the test pass on python2.5 and 2.6.
+    >>> try:
+    ...     directory = tarfile.getmember('rosetta-hoary/')
+    ... except KeyError:
+    ...     directory = tarfile.getmember('rosetta-hoary')
     >>> oct(directory.mode)
     '0755'
 
@@ -223,11 +232,11 @@
 
     >>> tarfile = string_to_tarfile(language_pack.file.read())
     >>> examine_tarfile(tarfile)
-    |     - | rosetta-grumpy/
+    |     - | rosetta-grumpy
     |     1 | rosetta-grumpy/mapping.txt
     |     1 | rosetta-grumpy/timestamp.txt
-    |     - | rosetta-grumpy/xpi/
-    |     - | rosetta-grumpy/xpi/firefox/
+    |     - | rosetta-grumpy/xpi
+    |     - | rosetta-grumpy/xpi/firefox
     |   bin | rosetta-grumpy/xpi/firefox/en-US.xpi
     |    94 | rosetta-grumpy/xpi/firefox/en.po
     |   102 | rosetta-grumpy/xpi/firefox/es.po
@@ -345,17 +354,17 @@
     # Get the generated tarball.
     >>> tarfile = string_to_tarfile(language_pack.file.read())
     >>> examine_tarfile(tarfile)
-    |     - | rosetta-grumpy/
-    |     - | rosetta-grumpy/cy/
-    |     - | rosetta-grumpy/cy/LC_MESSAGES/
+    |     - | rosetta-grumpy
+    |     - | rosetta-grumpy/cy
+    |     - | rosetta-grumpy/cy/LC_MESSAGES
     |    21 | rosetta-grumpy/cy/LC_MESSAGES/test.po
-    |     - | rosetta-grumpy/es/
-    |     - | rosetta-grumpy/es/LC_MESSAGES/
+    |     - | rosetta-grumpy/es
+    |     - | rosetta-grumpy/es/LC_MESSAGES
     |    21 | rosetta-grumpy/es/LC_MESSAGES/test.po
     |     2 | rosetta-grumpy/mapping.txt
     |     1 | rosetta-grumpy/timestamp.txt
-    |     - | rosetta-grumpy/xpi/
-    |     - | rosetta-grumpy/xpi/firefox/
+    |     - | rosetta-grumpy/xpi
+    |     - | rosetta-grumpy/xpi/firefox
     |   bin | rosetta-grumpy/xpi/firefox/en-US.xpi
     |    94 | rosetta-grumpy/xpi/firefox/en.po
     |   102 | rosetta-grumpy/xpi/firefox/es.po
@@ -444,14 +453,14 @@
 xpi entries because those are outside the scope of this test.
 
     >>> examine_tarfile(tarfile)
-    |     - | rosetta-grumpy/
-    |     - | rosetta-grumpy/cy/
-    |     - | rosetta-grumpy/cy/LC_MESSAGES/
+    |     - | rosetta-grumpy
+    |     - | rosetta-grumpy/cy
+    |     - | rosetta-grumpy/cy/LC_MESSAGES
     |    21 | rosetta-grumpy/cy/LC_MESSAGES/test.po
     |     2 | rosetta-grumpy/mapping.txt
     |     1 | rosetta-grumpy/timestamp.txt
-    |     - | rosetta-grumpy/xpi/
-    |     - | rosetta-grumpy/xpi/firefox/
+    |     - | rosetta-grumpy/xpi
+    |     - | rosetta-grumpy/xpi/firefox
     |   bin | rosetta-grumpy/xpi/firefox/en-US.xpi
     |    94 | rosetta-grumpy/xpi/firefox/en.po
     |   102 | rosetta-grumpy/xpi/firefox/es.po
@@ -489,17 +498,17 @@
 
     >>> tarfile = string_to_tarfile(language_pack.file.read())
     >>> examine_tarfile(tarfile)
-    |     - | rosetta-grumpy/
-    |     - | rosetta-grumpy/cy/
-    |     - | rosetta-grumpy/cy/LC_MESSAGES/
+    |     - | rosetta-grumpy
+    |     - | rosetta-grumpy/cy
+    |     - | rosetta-grumpy/cy/LC_MESSAGES
     |    21 | rosetta-grumpy/cy/LC_MESSAGES/test.po
-    |     - | rosetta-grumpy/es/
-    |     - | rosetta-grumpy/es/LC_MESSAGES/
+    |     - | rosetta-grumpy/es
+    |     - | rosetta-grumpy/es/LC_MESSAGES
     |    21 | rosetta-grumpy/es/LC_MESSAGES/test.po
     |     2 | rosetta-grumpy/mapping.txt
     |     1 | rosetta-grumpy/timestamp.txt
-    |     - | rosetta-grumpy/xpi/
-    |     - | rosetta-grumpy/xpi/firefox/
+    |     - | rosetta-grumpy/xpi
+    |     - | rosetta-grumpy/xpi/firefox
     |   bin | rosetta-grumpy/xpi/firefox/en-US.xpi
     |    94 | rosetta-grumpy/xpi/firefox/en.po
     |   102 | rosetta-grumpy/xpi/firefox/es.po
 
=== modified file 'lib/lp/translations/doc/poexport-request-productseries.txt'
--- lib/lp/translations/doc/poexport-request-productseries.txt	2010-03-05 15:31:22 +0000
+++ lib/lp/translations/doc/poexport-request-productseries.txt	2010-04-27 20:46:29 +0000
@@ -90,10 +90,12 @@
     >>> from canonical.launchpad.helpers import string_to_tarfile
     >>> tarball = string_to_tarfile(urllib2.urlopen(url).read())
     >>> for name in sorted(tarball.getnames()):
-    ...   print name
-    evolution-2.2/
+    ...     # XXX: 2010-04-26, Salgado, bug=570244: The .rstrip('/') is to
+    ...     # make this pass on python2.5 and 2.6.
+    ...     print name.rstrip('/')
+    evolution-2.2
     evolution-2.2/evolution-2.2-es.po
-    po/
+    po
     po/evolution-2.2-test-pt_BR.po
     po/evolution-2.2-test.pot
     po/evolution-2.2.pot
 
=== modified file 'lib/lp/translations/doc/poexport-request.txt'
--- lib/lp/translations/doc/poexport-request.txt	2010-03-05 20:40:40 +0000
+++ lib/lp/translations/doc/poexport-request.txt	2010-04-27 20:46:29 +0000
@@ -108,8 +108,10 @@
     >>> from canonical.launchpad.helpers import string_to_tarfile
     >>> tarball = string_to_tarfile(urllib2.urlopen(url).read())
     >>> for name in sorted(tarball.getnames()):
-    ...   print name
-    pmount/
+    ...     # XXX: 2010-04-26, Salgado, bug=570244: The .rstrip('/') is to
+    ...     # make this pass on python2.5 and 2.6.
+    ...     print name.rstrip('/')
+    pmount
     pmount/pmount-ca.po
     pmount/pmount-cs.po
 
 
=== modified file 'lib/lp/translations/doc/potemplate.txt'
--- lib/lp/translations/doc/potemplate.txt	2009-11-01 22:50:17 +0000
+++ lib/lp/translations/doc/potemplate.txt	2010-04-27 20:46:29 +0000
@@ -619,10 +619,13 @@
     >>> from canonical.launchpad.helpers import string_to_tarfile
     >>> tarfile_string = exported_translation_file.read()
     >>> tarfile = string_to_tarfile(tarfile_string)
-    >>> sorted(tarfile.getnames())
-    ['evolution-2.2/', 'evolution-2.2/evolution-2.2-es.po',
+
+    # XXX: 2010-04-26, Salgado, bug=570244: The .rstrip('/') is to make this
+    # pass on python2.5 and 2.6.
+    >>> sorted(name.rstrip('/') for name in tarfile.getnames())
+    ['evolution-2.2', 'evolution-2.2/evolution-2.2-es.po',
      'evolution-2.2/evolution-2.2-ja.po', 'evolution-2.2/evolution-2.2-xh.po',
-     'po/', 'po/evolution-2.2.pot']
+     'po', 'po/evolution-2.2.pot']
 
 The *-es.po file is indeed the Spanish translation...
 
 
=== modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt'
--- lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt	2010-01-19 12:35:33 +0000
+++ lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt	2010-04-27 20:46:29 +0000
@@ -79,10 +79,14 @@
     True
     >>> 'empty.po' in anon_browser.contents
     False
-    >>> 'directory.po/' in tarball.getnames()
+
+    # XXX: 2010-04-26, Salgado, bug=570244: Need this hack to make it pass on
+    # python2.5 (where tarball.getnames() include a trailing slash on
+    # directory names) and python2.6 (where directory names don't get a
+    # trailing slash).
+    >>> ('directory.po' in tarball.getnames()
+    ...  or 'directory.po/' in tarball.getnames())
     True
-    >>> 'directory.po/' in anon_browser.contents
-    False
     >>> 'directory.po' in anon_browser.contents
     False
     >>> 'directory.po/.another-dotfile.po' in tarball.getnames()
 
=== modified file 'lib/lp/translations/utilities/doc/gettext_mo_exporter.txt'
--- lib/lp/translations/utilities/doc/gettext_mo_exporter.txt	2009-07-02 17:16:50 +0000
+++ lib/lp/translations/utilities/doc/gettext_mo_exporter.txt	2010-04-27 20:46:29 +0000
@@ -79,12 +79,14 @@
     ...         lines = len(tarfile.extractfile(member).readlines())
     ...     else:
     ...         lines = 0
-    ...     print "| %5d | %s" % (lines, member.name)
-    |     0 | es/
-    |     0 | es/LC_MESSAGES/
+    ...     # XXX: 2010-04-26, Salgado, bug=570244: The .rstrip('/') is to
+    ...     # make this pass on python2.5 and 2.6.
+    ...     print "| %5d | %s" % (lines, member.name.rstrip('/'))
+    |     0 | es
+    |     0 | es/LC_MESSAGES
     |    12 | es/LC_MESSAGES/foo.mo
-    |     0 | sr/
-    |     0 | sr/LC_MESSAGES/
+    |     0 | sr
+    |     0 | sr/LC_MESSAGES
     |    12 | sr/LC_MESSAGES/foo.mo
 
 
 
=== modified file 'lib/lp/translations/utilities/doc/launchpad_write_tarfile.txt'
--- lib/lp/translations/utilities/doc/launchpad_write_tarfile.txt	2009-07-01 20:45:39 +0000
+++ lib/lp/translations/utilities/doc/launchpad_write_tarfile.txt	2010-04-27 20:46:29 +0000
@@ -20,6 +20,9 @@
     ...     for name in names:
     ...         file = tarfile.extractfile(name)
     ...
+    ...         # XXX: 2010-04-26, Salgado, bug=570244: This is to make the
+    ...         # test pass on python2.5 and 2.6.
+    ...         name = name.rstrip('/')
     ...         if file is not None:
     ...             print format % (name, file.read())
     ...         else:
@@ -96,9 +99,9 @@
     ...     'uno/dos/tres/cuatro': 'blah'
     ...     })
     >>> examine_tarfile(archive)
-    uno/                | 
-    uno/dos/            | 
-    uno/dos/tres/       | 
+    uno                 | 
+    uno/dos             | 
+    uno/dos/tres        | 
     uno/dos/tres/cuatro | blah
 
 Also, if there is a duplicated file, last one is the one that remains there.