parsedate_tz(): Minor cleanup.
Port from Python 2.3/email 2.5: Add a test for the tm_yday field is 1 in the return of parsedate().
This commit is contained in:
parent
5a49fae1ab
commit
602426e3cf
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (C) 2002-2004 Python Software Foundation
|
# Copyright (C) 2002-2006 Python Software Foundation
|
||||||
# Contact: email-sig@python.org
|
# Contact: email-sig@python.org
|
||||||
|
|
||||||
"""Email address parsing code.
|
"""Email address parsing code.
|
||||||
|
@ -117,8 +117,7 @@ def parsedate_tz(data):
|
||||||
else:
|
else:
|
||||||
tzsign = 1
|
tzsign = 1
|
||||||
tzoffset = tzsign * ( (tzoffset//100)*3600 + (tzoffset % 100)*60)
|
tzoffset = tzsign * ( (tzoffset//100)*3600 + (tzoffset % 100)*60)
|
||||||
tuple = (yy, mm, dd, thh, tmm, tss, 0, 1, 0, tzoffset)
|
return yy, mm, dd, thh, tmm, tss, 0, 1, 0, tzoffset
|
||||||
return tuple
|
|
||||||
|
|
||||||
|
|
||||||
def parsedate(data):
|
def parsedate(data):
|
||||||
|
|
|
@ -2104,6 +2104,15 @@ class TestMiscellaneous(TestEmailBase):
|
||||||
eq(Utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
|
eq(Utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
|
||||||
(2003, 2, 5, 13, 47, 26, 0, 1, 0, -28800))
|
(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):
|
def test_parseaddr_empty(self):
|
||||||
self.assertEqual(Utils.parseaddr('<>'), ('', ''))
|
self.assertEqual(Utils.parseaddr('<>'), ('', ''))
|
||||||
self.assertEqual(Utils.formataddr(Utils.parseaddr('<>')), '')
|
self.assertEqual(Utils.formataddr(Utils.parseaddr('<>')), '')
|
||||||
|
|
Loading…
Reference in New Issue