Merge lp:~allenap/launchpad/remove-xmlrpclib-marshalling-bug-254999 into lp:launchpad

[Gavin Panella]

Remove xmlrpclib.DateTime conversion hacks from external bug tracker code. Python 2.5's xmlrpclib groks datetime.datetime.

[Gavin Panella (allenap)]

Removes the xmlrpclib.DateTime() hacks in the external bug tracker code, as it's not needed with the version of xmlrpclib in Python 2.5. I've also done a fair bit of de-linting, but it's still a small change so I haven't broken it out into a separate patch.

[Brad Crittenden (bac)]

Hi Gavin,

The changes you made look good but I don't think you got all of the spots that need to be fixed. What about these others?

bzr ls -VR --kind=file --null | xargs -0 grep -In 254999
lib/lp/bugs/externalbugtracker/bugzilla.py:717: # XXX 2008-08-05 gmb (bug 254999):
lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt:141: # XXX 2009-08-21 gmb (bug 254999):
lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt:210: >>> # XXX 2008-08-05 gmb (bug 254999):
lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt:238: >>> # XXX 2008-08-05 gmb (bug 254999):
lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt:276: >>> # XXX 2008-08-05 gmb (bug 254999):
lib/lp/bugs/tests/externalbugtracker.py:603: # XXX 2008-08-05 gmb (bug 254999):

review: Needs Fixing (code)

[Gavin Panella (allenap)]

Thanks for spotting that I'd missed those. The incremental diff is
pretty big, but a lot of it is just the same date format changes in
innumerable doctests.

[Brad Crittenden (bac)]

Thanks for the additional changes Gavin. It looks good now.

review: Approve (code)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt	2009-12-21 15:03:42 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt	2009-12-23 12:17:18 +0000
@@ -139,8 +139,8 @@
     >>> def print_bugs(bugs):
     ...     for bug in sorted(bugs):
     ...         print "Bug %s:" % bug
-    ...         for key in sorted(bugzilla._bugs[bug]):
-    ...             print "    %s: %s" % (key, bugzilla._bugs[bug][key])
+    ...         for key in sorted(bugs[bug]):
+    ...             print "    %s: %s" % (key, bugs[bug][key])
     ...         print "\n"
 
     >>> print_bugs(bugzilla._bugs)
@@ -148,11 +148,11 @@
         alias:
         assigned_to: [e-mail]
         component: GPPSystems
-        creation_time: 20080610T16:19:53
+        creation_time: 2008-06-10 16:19:53
         id: 1
         internals:...
         is_open: True
-        last_change_time: 20080610T16:19:53
+        last_change_time: 2008-06-10 16:19:53
         priority: P1
         product: Marvin
         resolution: FIXED
@@ -165,11 +165,11 @@
         alias: bug-two
         assigned_to: [e-mail]
         component: Crew
-        creation_time: 20080611T09:23:12
+        creation_time: 2008-06-11 09:23:12
         id: 2
         internals:...
         is_open: True
-        last_change_time: 20080611T09:24:29
+        last_change_time: 2008-06-11 09:24:29
         priority: P1
         product: HeartOfGold
         resolution:
@@ -194,20 +194,16 @@
     >>> bugzilla.initializeRemoteBugDB([2, 'bug-two'])
     CALLED Bug.get({'ids': [2, 'bug-two'], 'permissive': True})
 
-    >>> for bug in sorted(bugzilla._bugs):
-    ...     print "Bug %r:" % bug
-    ...     for key in sorted(bugzilla._bugs[bug]):
-    ...         print "    %s: %s" % (key, bugzilla._bugs[bug][key])
-    ...     print "\n"
+    >>> print_bugs(bugzilla._bugs)
     Bug 2:
         alias: bug-two
         assigned_to: [e-mail]
         component: Crew
-        creation_time: 20080611T09:23:12
+        creation_time: 2008-06-11 09:23:12
         id: 2
         internals:...
         is_open: True
-        last_change_time: 20080611T09:24:29
+        last_change_time: 2008-06-11 09:24:29
         priority: P1
         product: HeartOfGold
         resolution:
@@ -450,14 +446,14 @@
         id: 1
         is_private: False
         text: I'd really appreciate it if Marvin would enjoy life a bit.
-        time: 20080616T12:44:29
+        time: 2008-06-16 12:44:29
     Comment 3:
         author: marvin
         bug_id: 1
         id: 3
         is_private: False
         text: Life? Don't talk to me about life.
-        time: 20080616T13:22:29
+        time: 2008-06-16 13:22:29
 
 If we try to fetch comments that don't belong to the current bug
 fetchComments() will silently ignore them.
@@ -477,7 +473,7 @@
         id: 1
         is_private: False
         text: I'd really appreciate it if Marvin would enjoy life a bit.
-        time: 20080616T12:44:29
+        time: 2008-06-16 12:44:29
 
 
 getPosterForComment()
@@ -521,7 +517,7 @@
 field on the imported comment.
 
     >>> print bugzilla._bugs[2]['comments'][2]['time']
-    20080616T13:08:08
+    2008-06-16 13:08:08
 
     >>> print message.datecreated
     2008-06-16 13:08:08+00:00

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt	2009-12-21 15:03:42 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt	2009-12-23 12:17:18 +0000
@@ -204,8 +204,8 @@
     >>> def print_bugs(bugs):
     ...     for bug in sorted(bugs):
     ...         print "Bug %s:" % bug
-    ...         for key in sorted(bugzilla._bugs[bug]):
-    ...             print "    %s: %s" % (key, bugzilla._bugs[bug][key])
+    ...         for key in sorted(bugs[bug]):
+    ...             print "    %s: %s" % (key, bugs[bug][key])
     ...         print "\n"
 
     >>> print_bugs(bugzilla._bugs)
@@ -213,11 +213,11 @@
         alias:
         assigned_to: [e-mail]
         component: GPPSystems
-        creation_time: 20080610T16:19:53
+        creation_time: 2008-06-10 16:19:53
         id: 1
         internals:...
         is_open: True
-        last_change_time: 20080610T16:19:53
+        last_change_time: 2008-06-10 16:19:53
         priority: P1
         product: Marvin
         resolution: FIXED
@@ -230,11 +230,11 @@
         alias: bug-two
         assigned_to: [e-mail]
         component: Crew
-        creation_time: 20080611T09:23:12
+        creation_time: 2008-06-11 09:23:12
         id: 2
         internals:...
         is_open: True
-        last_change_time: 20080611T09:24:29
+        last_change_time: 2008-06-11 09:24:29
         priority: P1
         product: HeartOfGold
         resolution:
@@ -416,13 +416,13 @@
         id: 1
         number: 1
         text: I'd really appreciate it if Marvin would enjoy life a bit.
-        time: 20080616T12:44:29
+        time: 2008-06-16 12:44:29
     Comment 3:
         author: marvin
         id: 3
         number: 2
         text: Life? Don't talk to me about life.
-        time: 20080616T13:22:29
+        time: 2008-06-16 13:22:29
 
 
 Pushing comments to remote systems
@@ -560,11 +560,11 @@
         alias: bug-two
         assigned_to: [e-mail]
         component: Crew
-        creation_time: 20080611T09:23:12
+        creation_time: 2008-06-11 09:23:12
         id: 2
         internals:...
         is_open: True
-        last_change_time: 20080611T09:24:29
+        last_change_time: 2008-06-11 09:24:29
         priority: P1
         product: HeartOfGold
         resolution:

=== modified file 'lib/lp/bugs/externalbugtracker/bugzilla.py'
--- lib/lp/bugs/externalbugtracker/bugzilla.py	2009-12-21 14:46:05 +0000
+++ lib/lp/bugs/externalbugtracker/bugzilla.py	2009-12-23 12:17:18 +0000
@@ -12,11 +12,9 @@
     ]
 
 import pytz
-import time
 import xml.parsers.expat
 import xmlrpclib
 
-from datetime import datetime
 from email.Utils import parseaddr
 from xml.dom import minidom
 
@@ -505,28 +503,17 @@
         """See `IExternalBugTracker`."""
         time_dict = self.xmlrpc_proxy.Bugzilla.time()
 
-        # Convert the XML-RPC DateTime we get back into a regular Python
-        # datetime.
-        server_db_timetuple = time.strptime(
-            str(time_dict['db_time']), '%Y%m%dT%H:%M:%S')
-        server_db_datetime = datetime(*server_db_timetuple[:6])
-
         # The server's DB time is the one that we want to use. However,
         # this may not be in UTC, so we need to convert it. Since we
         # can't guarantee that the timezone data returned by the server
         # is sane, we work out the server's offset from UTC by looking
         # at the difference between the web_time and the web_time_utc
         # values.
-        server_web_time = time.strptime(
-            str(time_dict['web_time']), '%Y%m%dT%H:%M:%S')
-        server_web_datetime = datetime(*server_web_time[:6])
-        server_web_time_utc = time.strptime(
-            str(time_dict['web_time_utc']), '%Y%m%dT%H:%M:%S')
-        server_web_datetime_utc = datetime(*server_web_time_utc[:6])
-
+        server_web_datetime = time_dict['web_time']
+        server_web_datetime_utc = time_dict['web_time_utc']
         server_utc_offset = server_web_datetime - server_web_datetime_utc
+        server_db_datetime = time_dict['db_time']
         server_utc_datetime = server_db_datetime - server_utc_offset
-
         return server_utc_datetime.replace(tzinfo=pytz.timezone('UTC'))
 
     def _getActualBugId(self, bug_id):
@@ -558,7 +545,7 @@
         bug_ids_to_retrieve = []
         for bug_id in bug_ids:
             try:
-                actual_bug_id = self._getActualBugId(bug_id)
+                self._getActualBugId(bug_id)
             except BugNotFound:
                 bug_ids_to_retrieve.append(bug_id)
 
@@ -590,7 +577,7 @@
         try:
             status = self._bugs[actual_bug_id]['status']
             resolution = self._bugs[actual_bug_id]['resolution']
-        except KeyError, error:
+        except KeyError:
             raise UnparseableBugData
 
         if resolution != '':
@@ -600,27 +587,14 @@
 
     def getModifiedRemoteBugs(self, bug_ids, last_checked):
         """See `IExternalBugTracker`."""
-        # We marshal last_checked into an xmlrpclib.DateTime since
-        # xmlrpclib can't do so cleanly itself.
-        # XXX 2009-08-21 gmb (bug 254999):
-        #     We can remove this once we upgrade to python 2.5.
-        changed_since = xmlrpclib.DateTime(last_checked.timetuple())
-
-        search_args = {
-            'id': bug_ids,
-            'last_change_time': changed_since,
-            }
-        response_dict = self.xmlrpc_proxy.Bug.search(search_args)
+        response_dict = self.xmlrpc_proxy.Bug.search(
+            {'id': bug_ids, 'last_change_time': last_checked})
         remote_bugs = response_dict['bugs']
-
         # Store the bugs we've imported and return only their IDs.
         self._storeBugs(remote_bugs)
-
         # Marshal the bug IDs into strings before returning them since
         # the remote Bugzilla may return ints rather than strings.
-        bug_ids = [str(remote_bug['id']) for remote_bug in remote_bugs]
-
-        return bug_ids
+        return [str(remote_bug['id']) for remote_bug in remote_bugs]
 
     def getRemoteProduct(self, remote_bug):
         """See `IExternalBugTracker`."""
@@ -728,22 +702,9 @@
         # bug 248938).
         comment_id = int(comment_id)
         comment = self._bugs[actual_bug_id]['comments'][comment_id]
-
-        # Turn the time in the comment, which is an XML-RPC datetime
-        # into something more useful to us.
-        # XXX 2008-08-05 gmb (bug 254999):
-        #     We can remove these lines once we upgrade to python 2.5.
-        comment_timestamp = time.mktime(
-            time.strptime(str(comment['time']), '%Y%m%dT%H:%M:%S'))
-        comment_datetime = datetime.fromtimestamp(comment_timestamp)
-        comment_datetime = comment_datetime.replace(
-            tzinfo=pytz.timezone('UTC'))
-
-        message = getUtility(IMessageSet).fromText(
+        return getUtility(IMessageSet).fromText(
             owner=poster, subject='', content=comment['text'],
-            datecreated=comment_datetime)
-
-        return message
+            datecreated=comment['time'].replace(tzinfo=pytz.timezone('UTC')))
 
     @needs_authentication
     def addRemoteComment(self, remote_bug, comment_body, rfc822msgid):
@@ -826,7 +787,7 @@
         token_text = internal_xmlrpc_server.newBugTrackerToken()
 
         try:
-            user_id = self.xmlrpc_proxy.Launchpad.login(
+            self.xmlrpc_proxy.Launchpad.login(
                 {'token': token_text})
         except xmlrpclib.Fault, fault:
             message = 'XML-RPC Fault: %s "%s"' % (
@@ -841,28 +802,17 @@
 
     def getModifiedRemoteBugs(self, bug_ids, last_checked):
         """See `IExternalBugTracker`."""
-        # We marshal last_checked into an xmlrpclib.DateTime since
-        # xmlrpclib can't do so cleanly itself.
-        # XXX 2008-08-05 gmb (bug 254999):
-        #     We can remove this once we upgrade to python 2.5.
-        changed_since = xmlrpclib.DateTime(last_checked.timetuple())
-
-        # Create the arguments that we're going to send to the remote
-        # server. We pass permissive=True to ensure that Bugzilla won't
-        # error if we ask for a bug that doesn't exist.
-        request_args = {
+        # We pass permissive=True to ensure that Bugzilla won't error
+        # if we ask for a bug that doesn't exist.
+        response_dict = self.xmlrpc_proxy.Launchpad.get_bugs({
             'ids': bug_ids,
-            'changed_since': changed_since,
+            'changed_since': last_checked,
             'permissive': True,
-            }
-        response_dict = self.xmlrpc_proxy.Launchpad.get_bugs(request_args)
+            })
         remote_bugs = response_dict['bugs']
-
         # Store the bugs we've imported and return only their IDs.
         self._storeBugs(remote_bugs)
-        bug_ids = [remote_bug['id'] for remote_bug in remote_bugs]
-
-        return bug_ids
+        return [remote_bug['id'] for remote_bug in remote_bugs]
 
     def initializeRemoteBugDB(self, bug_ids, products=None):
         """See `IExternalBugTracker`."""
@@ -892,10 +842,7 @@
 
         # Return the UTC time sent by the server so that we don't have
         # to care about timezones.
-        server_timetuple = time.strptime(
-            str(time_dict['utc_time']), '%Y%m%dT%H:%M:%S')
-
-        server_utc_time = datetime(*server_timetuple[:6])
+        server_utc_time = time_dict['utc_time']
         return server_utc_time.replace(tzinfo=pytz.timezone('UTC'))
 
     def getCommentIds(self, bug_watch):

=== modified file 'lib/lp/bugs/externalbugtracker/xmlrpc.py'
--- lib/lp/bugs/externalbugtracker/xmlrpc.py	2009-10-16 22:00:45 +0000
+++ lib/lp/bugs/externalbugtracker/xmlrpc.py	2009-12-23 12:17:18 +0000
@@ -64,10 +64,9 @@
     verbose = False
 
     def __init__(self, endpoint, cookie_jar=None):
-        Transport.__init__(self)
+        Transport.__init__(self, use_datetime=True)
         self.scheme, self.host = urlparse(endpoint)[:2]
-        assert (
-            self.scheme in ('http', 'https'),
+        assert self.scheme in ('http', 'https'), (
             "Unsupported URL scheme: %s" % self.scheme)
         self.cookie_processor = HTTPCookieProcessor(cookie_jar)
         self.redirect_handler = XMLRPCRedirectHandler()

=== modified file 'lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt'
--- lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt	2009-11-30 09:33:24 +0000
+++ lib/lp/bugs/tests/bugzilla-api-xmlrpc-transport.txt	2009-12-23 12:17:18 +0000
@@ -66,12 +66,12 @@
     >>> time_dict = server.Bugzilla.time()
     >>> for key in sorted(time_dict):
     ...     print "%s: %s" % (key, time_dict[key])
-    db_time: 20080501T01:01:01
+    db_time: 2008-05-01 01:01:01
     tz_name: UTC
     tz_offset: +0000
     tz_short_name: UTC
-    web_time: 20080501T01:01:01
-    web_time_utc: 20080501T01:01:01
+    web_time: 2008-05-01 01:01:01
+    web_time_utc: 2008-05-01 01:01:01
 
 If the remote server is in a different timezone, the db_time and
 web_time items will be in the server's local timezone whilst
@@ -82,12 +82,12 @@
     >>> time_dict = server.Bugzilla.time()
     >>> for key in sorted(time_dict):
     ...     print "%s: %s" % (key, time_dict[key])
-    db_time: 20080501T01:01:01
+    db_time: 2008-05-01 01:01:01
     tz_name: CET
     tz_offset: +0100
     tz_short_name: CET
-    web_time: 20080501T01:01:01
-    web_time_utc: 20080501T00:01:01
+    web_time: 2008-05-01 01:01:01
+    web_time_utc: 2008-05-01 00:01:01
 
 
 Getting bugs from the server
@@ -105,11 +105,11 @@
     alias: 
     assigned_to: [e-mail]
     component: GPPSystems
-    creation_time: 20080610T16:19:53
+    creation_time: 2008-06-10 16:19:53
     id: 1
     internals:...
     is_open: True
-    last_change_time: 20080610T16:19:53
+    last_change_time: 2008-06-10 16:19:53
     priority: P1
     product: Marvin
     resolution: FIXED
@@ -135,16 +135,7 @@
 date / time.
 
     >>> from datetime import datetime
-    >>> from xmlrpclib import DateTime
     >>> last_change_time = datetime(2008, 6, 11, 9, 0, 0)
-
-    # XXX 2009-08-21 gmb (bug 254999):
-    #     We can remove this once we upgrade to python 2.5. We encode
-    #     last_change_time into an XML-RPC DateTime manually. This is
-    #     because xmlrpclib can't handle DateTime encoding within a
-    #     dict.
-    >>> last_change_time = DateTime(last_change_time.timetuple())
-
     >>> return_value = server.Bug.search({
     ...     'last_change_time': last_change_time,
     ...     })
@@ -158,11 +149,11 @@
     alias: bug-two
     assigned_to: [e-mail]
     component: Crew
-    creation_time: 20080611T09:23:12
+    creation_time: 2008-06-11 09:23:12
     id: 2
     internals:...
     is_open: True
-    last_change_time: 20080611T09:24:29
+    last_change_time: 2008-06-11 09:24:29
     priority: P1
     product: HeartOfGold
     resolution: 
@@ -175,7 +166,6 @@
 results to those IDs.
 
     >>> last_change_time = datetime(2007, 6, 10, 1, 1, 1)
-    >>> last_change_time = DateTime(last_change_time.timetuple())
     >>> return_value = server.Bug.search({
     ...     'id': [1],
     ...     'last_change_time': last_change_time,
@@ -188,11 +178,11 @@
     alias: 
     assigned_to: [e-mail]
     component: GPPSystems
-    creation_time: 20080610T16:19:53
+    creation_time: 2008-06-10 16:19:53
     id: 1
     internals:...
     is_open: True
-    last_change_time: 20080610T16:19:53
+    last_change_time: 2008-06-10 16:19:53
     priority: P1
     product: Marvin
     resolution: FIXED
@@ -206,11 +196,6 @@
 
     >>> from datetime import timedelta
     >>> last_change_time = datetime.now() + timedelta(days=42)
-
-    >>> # XXX 2008-08-05 gmb (bug 254999):
-    >>> #     We can remove this once we upgrade to python 2.5.
-    >>> last_change_time = DateTime(last_change_time.timetuple())
-
     >>> return_value = server.Bug.search({
     ...     'last_change_time': last_change_time,
     ...     })
@@ -232,11 +217,11 @@
     alias: bug-two
     assigned_to: [e-mail]
     component: Crew
-    creation_time: 20080611T09:23:12
+    creation_time: 2008-06-11 09:23:12
     id: 2
     internals:...
     is_open: True
-    last_change_time: 20080611T09:24:29
+    last_change_time: 2008-06-11 09:24:29
     priority: P1
     product: HeartOfGold
     resolution: 
@@ -257,11 +242,11 @@
     alias: 
     assigned_to: [e-mail]
     component: GPPSystems
-    creation_time: 20080610T16:19:53
+    creation_time: 2008-06-10 16:19:53
     id: 1
     internals:...
     is_open: True
-    last_change_time: 20080610T16:19:53
+    last_change_time: 2008-06-10 16:19:53
     priority: P1
     product: Marvin
     resolution: FIXED
@@ -272,11 +257,11 @@
     alias: bug-two
     assigned_to: [e-mail]
     component: Crew
-    creation_time: 20080611T09:23:12
+    creation_time: 2008-06-11 09:23:12
     id: 2
     internals:...
     is_open: True
-    last_change_time: 20080611T09:24:29
+    last_change_time: 2008-06-11 09:24:29
     priority: P1
     product: HeartOfGold
     resolution: 
@@ -321,14 +306,14 @@
         id: 1
         is_private: False
         text: I'd really appreciate it if Marvin would enjoy life a bit.
-        time: 20080616T12:44:29
+        time: 2008-06-16 12:44:29
     <BLANKLINE>
         author: marvin
         bug_id: 1
         id: 3
         is_private: False
         text: Life? Don't talk to me about life.
-        time: 20080616T13:22:29
+        time: 2008-06-16 13:22:29
     <BLANKLINE>
     <BLANKLINE>
     Bug 2:
@@ -337,14 +322,14 @@
         id: 2
         is_private: False
         text: Bring the passengers to the bridge please Marvin.
-        time: 20080616T13:08:08
+        time: 2008-06-16 13:08:08
     <BLANKLINE>
         author: Ford Prefect <[e-mail]>
         bug_id: 2
         id: 4
         is_private: False
         text: I appear to have become a perfectly safe penguin.
-        time: 20080617T20:28:40
+        time: 2008-06-17 20:28:40
     <BLANKLINE>
     <BLANKLINE>
 
@@ -366,14 +351,14 @@
         id: 1
         is_private: False
         text: I'd really appreciate it if Marvin would enjoy life a bit.
-        time: 20080616T12:44:29
+        time: 2008-06-16 12:44:29
     Comment 4:
         author: Ford Prefect <[e-mail]>
         bug_id: 2
         id: 4
         is_private: False
         text: I appear to have become a perfectly safe penguin.
-        time: 20080617T20:28:40
+        time: 2008-06-17 20:28:40
     <BLANKLINE>
 
 Note that only comments have been returned when only 'comment_ids' have
@@ -499,11 +484,11 @@
     alias: 
     assigned_to: [e-mail]
     component: GPPSystems
-    creation_time: 20080610T16:19:53
+    creation_time: 2008-06-10 16:19:53
     id: 1
     internals:...
     is_open: True
-    last_change_time: 20080610T16:19:53
+    last_change_time: 2008-06-10 16:19:53
     priority: P1
     product: Marvin
     resolution: FIXED

=== modified file 'lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt'
--- lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt	2009-12-11 16:05:52 +0000
+++ lib/lp/bugs/tests/bugzilla-xmlrpc-transport.txt	2009-12-23 12:17:18 +0000
@@ -105,9 +105,9 @@
     >>> time_dict = server.Launchpad.time()
     >>> for key in sorted(time_dict):
     ...     print "%s: %s" % (key, time_dict[key])
-    local_time: 20080501T01:01:01
+    local_time: 2008-05-01 01:01:01
     tz_name: UTC
-    utc_time: 20080501T01:01:01
+    utc_time: 2008-05-01 01:01:01
 
 We can set the local time value on the remote server to make testing
 more useful.
@@ -122,9 +122,9 @@
     >>> time_dict = server.Launchpad.time()
     >>> for key in sorted(time_dict):
     ...     print "%s: %s" % (key, time_dict[key])
-    local_time: 20080515T16:19:53
+    local_time: 2008-05-15 16:19:53
     tz_name: US/Central
-    utc_time: 20080515T22:19:53
+    utc_time: 2008-05-15 22:19:53
 
 
 Launchpad.get_bugs()
@@ -144,11 +144,11 @@
     alias: 
     assigned_to: [e-mail]
     component: GPPSystems
-    creation_time: 20080610T16:19:53
+    creation_time: 2008-06-10 16:19:53
     id: 1
     internals:...
     is_open: True
-    last_change_time: 20080610T16:19:53
+    last_change_time: 2008-06-10 16:19:53
     priority: P1
     product: Marvin
     resolution: FIXED
@@ -170,11 +170,11 @@
     alias: 
     assigned_to: [e-mail]
     component: GPPSystems
-    creation_time: 20080610T16:19:53
+    creation_time: 2008-06-10 16:19:53
     id: 1
     internals:...
     is_open: True
-    last_change_time: 20080610T16:19:53
+    last_change_time: 2008-06-10 16:19:53
     priority: P1
     product: Marvin
     resolution: FIXED
@@ -186,11 +186,11 @@
     alias: bug-two
     assigned_to: [e-mail]
     component: Crew
-    creation_time: 20080611T09:23:12
+    creation_time: 2008-06-11 09:23:12
     id: 2
     internals:...
     is_open: True
-    last_change_time: 20080611T09:24:29
+    last_change_time: 2008-06-11 09:24:29
     priority: P1
     product: HeartOfGold
     resolution:
@@ -209,11 +209,11 @@
     alias: bug-two
     assigned_to: [e-mail]
     component: Crew
-    creation_time: 20080611T09:23:12
+    creation_time: 2008-06-11 09:23:12
     id: 2
     internals:...
     is_open: True
-    last_change_time: 20080611T09:24:29
+    last_change_time: 2008-06-11 09:24:29
     priority: P1
     product: HeartOfGold
     resolution: 
@@ -228,17 +228,8 @@
 allowing Launchpad to get only the recently-updated subset of a given
 set of remote bugs.
 
-    >>> from xmlrpclib import DateTime
-
     >>> changed_since = datetime(2008, 6, 11, 9, 0, 0)
 
-    >>> # We encode changed_since into an XML-RPC DateTime manually.
-    >>> # This is because xmlrpclib can't handle DateTime encoding
-    >>> # within a dict.
-    >>> # XXX 2008-08-05 gmb (bug 254999):
-    >>> #     We can remove this once we upgrade to python 2.5.
-    >>> changed_since = DateTime(changed_since.timetuple())
-
     >>> return_value = server.Launchpad.get_bugs({
     ...     'ids': [1, 2],
     ...     'changed_since': changed_since,
@@ -254,11 +245,11 @@
     alias: bug-two
     assigned_to: [e-mail]
     component: Crew
-    creation_time: 20080611T09:23:12
+    creation_time: 2008-06-11 09:23:12
     id: 2
     internals:...
     is_open: True
-    last_change_time: 20080611T09:24:29
+    last_change_time: 2008-06-11 09:24:29
     priority: P1
     product: HeartOfGold
     resolution: 
@@ -273,10 +264,6 @@
     >>> from datetime import timedelta
     >>> changed_since = datetime.now() + timedelta(days=42)
 
-    >>> # XXX 2008-08-05 gmb (bug 254999):
-    >>> #     We can remove this once we upgrade to python 2.5.
-    >>> changed_since = DateTime(changed_since.timetuple())
-
     >>> return_value = server.Launchpad.get_bugs({
     ...     'ids': [1, 2],
     ...     'changed_since': changed_since,
@@ -304,11 +291,11 @@
     alias: bug-two
     assigned_to: [e-mail]
     component: Crew
-    creation_time: 20080611T09:23:12
+    creation_time: 2008-06-11 09:23:12
     id: 2
     internals:...
     is_open: True
-    last_change_time: 20080611T09:24:29
+    last_change_time: 2008-06-11 09:24:29
     priority: P1
     product: HeartOfGold
     resolution: 
@@ -366,13 +353,13 @@
         id: 1
         number: 1
         text: I'd really appreciate it if Marvin would enjoy life a bit.
-        time: 20080616T12:44:29
+        time: 2008-06-16 12:44:29
     <BLANKLINE>
         author: marvin
         id: 3
         number: 2
         text: Life? Don't talk to me about life.
-        time: 20080616T13:22:29
+        time: 2008-06-16 13:22:29
     <BLANKLINE>
     <BLANKLINE>
     Bug 2:
@@ -380,13 +367,13 @@
         id: 2
         number: 1
         text: Bring the passengers to the bridge please Marvin.
-        time: 20080616T13:08:08
+        time: 2008-06-16 13:08:08
     <BLANKLINE>
         author: Ford Prefect <[e-mail]>
         id: 4
         number: 2
         text: I appear to have become a perfectly safe penguin.
-        time: 20080617T20:28:40
+        time: 2008-06-17 20:28:40
 
 If an ids parameter is specified along with bug_ids, only the comments
 whose IDs are in the list of IDs passed will be returned.
@@ -401,7 +388,7 @@
         id: 1
         number: 1
         text: I'd really appreciate it if Marvin would enjoy life a bit.
-        time: 20080616T12:44:29
+        time: 2008-06-16 12:44:29
     <BLANKLINE>
     <BLANKLINE>
     Bug 2:
@@ -409,7 +396,7 @@
         id: 2
         number: 1
         text: Bring the passengers to the bridge please Marvin.
-        time: 20080616T13:08:08
+        time: 2008-06-16 13:08:08
 
 Passing an include_fields parameter allows us to limit which fields are
 returned for each comment.

=== modified file 'lib/lp/bugs/tests/externalbugtracker.py'
--- lib/lp/bugs/tests/externalbugtracker.py	2009-11-30 10:21:23 +0000
+++ lib/lp/bugs/tests/externalbugtracker.py	2009-12-23 12:17:18 +0000
@@ -65,7 +65,7 @@
     while bugtracker_set.getByName("%s-%d" % (name, index)) is not None:
         index += 1
     name += '-%d' % index
-    bugtracker = BugTracker(
+    BugTracker(
         name=name,
         title='%s *TESTING*' % (bugtracker_type.title,),
         bugtrackertype=bugtracker_type,
@@ -282,7 +282,6 @@
             buglist_xml = read_test_file(self.buglist_file)
             bug_ids = str(form[self.bug_id_form_element]).split(',')
             bug_li_items = []
-            status_tag = None
             for bug_id in bug_ids:
                 bug_id = int(bug_id)
                 if bug_id not in self.bugzilla_bugs:
@@ -527,17 +526,12 @@
         if local_datetime is None:
             local_datetime = datetime(2008, 5, 1, 1, 1, 1)
 
-        # We return xmlrpc dateTimes rather than doubles since that's
-        # what BugZilla will return.
-        local_time = xmlrpclib.DateTime(local_datetime.timetuple())
-
         utc_offset_delta = timedelta(seconds=self.utc_offset)
         utc_date_time = local_datetime - utc_offset_delta
 
-        utc_time = xmlrpclib.DateTime(utc_date_time.timetuple())
         return {
-            'local_time': local_time,
-            'utc_time': utc_time,
+            'local_time': local_datetime,
+            'utc_time': utc_date_time,
             'tz_name': self.timezone,
             }
 
@@ -593,7 +587,6 @@
             "One of ('ids', 'products') should be specified")
 
         bugs_to_return = []
-        bugs = dict(self.bugs)
 
         # We enforce permissiveness, since we'll always call this method
         # with permissive=True in the Real World.
@@ -601,14 +594,14 @@
         assert permissive, "get_bugs() must be called with permissive=True"
 
         # If a changed_since argument is specified, marshall it into a
-        # datetime so that we can use it for comparisons.
-        # XXX 2008-08-05 gmb (bug 254999):
-        #     We can remove these lines once we upgrade to python 2.5.
+        # datetime so that we can use it for comparisons. Even though
+        # xmlrpclib in Python 2.5 groks datetime, by the time this
+        # method is called xmlrpclib has already converted all
+        # datetimes to xmlrpclib.DateTime.
         changed_since = arguments.get('changed_since')
         if changed_since is not None:
-            changed_since_timetuple = time.strptime(
-                str(changed_since), '%Y%m%dT%H:%M:%S')
-            changed_since = datetime(*changed_since_timetuple[:6])
+            changed_since = datetime.strptime(
+                changed_since.value, '%Y%m%dT%H:%M:%S')
 
         # If we have some products but no bug_ids we just get all the
         # bug IDs for those products and stuff them in the bug_ids list
@@ -644,14 +637,6 @@
                 bug_dict['product'] not in products):
                 continue
 
-            # Update the DateTime fields of the bug dict so that they
-            # look like ones that would be sent over XML-RPC.
-            for time_field in ('creation_time', 'last_change_time'):
-                datetime_value = bug_dict[time_field]
-                timestamp = time.mktime(datetime_value.timetuple())
-                xmlrpc_datetime = xmlrpclib.DateTime(timestamp)
-                bug_dict[time_field] = xmlrpc_datetime
-
             bugs_to_return.append(bug_dict)
 
         # "Why are you returning a list here?" I hear you cry. Well,
@@ -662,15 +647,9 @@
 
     def _copy_comment(self, comment, fields_to_return=None):
         # Copy wanted fields.
-        comment = dict(
+        return dict(
             (key, value) for (key, value) in comment.iteritems()
             if fields_to_return is None or key in fields_to_return)
-        # Replace the time field with an XML-RPC DateTime.
-        if 'time' in comment:
-            comment['time'] = xmlrpclib.DateTime(
-                comment['time'].timetuple())
-        return comment
-
 
     def comments(self, arguments):
         """Return comments for a given set of bugs."""
@@ -1617,8 +1596,7 @@
         The response body is an XMLRPC response. In addition we set the
         info of the response to contain a cookie.
         """
-        assert (
-            isinstance(req, Request),
+        assert isinstance(req, Request), (
             'Expected a urllib2.Request, got %s' % req)
 
         if 'testError' in req.data: