From: Barry Warsaw <barry@python.org>
Date: Fri, 3 Feb 2006 05:41:33 +0000 (+0000)
Subject: Port r42228 from the trunk.
X-Git-Tag: v2.4.3c1~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c7c84d94df705c610eb20be6aa6a803d6337bb8;p=thirdparty%2FPython%2Fcpython.git

Port r42228 from the trunk.
---

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index f6efcd5c1ea3..7d759efbcff5 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2004 Python Software Foundation
+# Copyright (C) 2002-2006 Python Software Foundation
 # Contact: email-sig@python.org
 
 """Email address parsing code.
@@ -117,8 +117,7 @@ def parsedate_tz(data):
         else:
             tzsign = 1
         tzoffset = tzsign * ( (tzoffset//100)*3600 + (tzoffset % 100)*60)
-    tuple = (yy, mm, dd, thh, tmm, tss, 0, 1, 0, tzoffset)
-    return tuple
+    return yy, mm, dd, thh, tmm, tss, 0, 1, 0, tzoffset
 
 
 def parsedate(data):
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index c22603df7dbb..a68ceba49c39 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -2104,6 +2104,15 @@ class TestMiscellaneous(TestEmailBase):
         eq(Utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
            (2003, 2, 5, 13, 47, 26, 0, 1, 0, -28800))
 
+    def test_parsedate_acceptable_to_time_functions(self):
+        eq = self.assertEqual
+        timetup = Utils.parsedate('5 Feb 2003 13:47:26 -0800')
+        eq(int(time.mktime(timetup)), 1044470846)
+        eq(int(time.strftime('%Y', timetup)), 2003)
+        timetup = Utils.parsedate_tz('5 Feb 2003 13:47:26 -0800')
+        eq(int(time.mktime(timetup[:9])), 1044470846)
+        eq(int(time.strftime('%Y', timetup[:9])), 2003)
+
     def test_parseaddr_empty(self):
         self.assertEqual(Utils.parseaddr('<>'), ('', ''))
         self.assertEqual(Utils.formataddr(Utils.parseaddr('<>')), '')