[Python-checkins] r42229 - in python/branches/release24-maint/Lib/email: _parseaddr.py test/test_email.py

Fri Feb 3 06:41:36 CET 2006

Author: barry.warsaw
Date: Fri Feb 3 06:41:33 2006
New Revision: 42229
Modified:
 python/branches/release24-maint/Lib/email/_parseaddr.py
 python/branches/release24-maint/Lib/email/test/test_email.py
Log:
Port r42228 from the trunk.
Modified: python/branches/release24-maint/Lib/email/_parseaddr.py
==============================================================================

--- python/branches/release24-maint/Lib/email/_parseaddr.py	(original)
+++ python/branches/release24-maint/Lib/email/_parseaddr.py	Fri Feb 3 06:41:33 2006
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2004 Python Software Foundation
+# Copyright (C) 2002-2006 Python Software Foundation
 # Contact: email-sig at python.org
 
 """Email address parsing code.
@@ -117,8 +117,7 @@
 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):
Modified: python/branches/release24-maint/Lib/email/test/test_email.py
==============================================================================
--- python/branches/release24-maint/Lib/email/test/test_email.py	(original)
+++ python/branches/release24-maint/Lib/email/test/test_email.py	Fri Feb 3 06:41:33 2006
@@ -2104,6 +2104,15 @@
 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('<>')), '')
