mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 88231 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88231 | alexander.belopolsky | 2011-01-29 12:19:08 -0500 (Sat, 29 Jan 2011) | 4 lines

  Issue #10939: Fixed imaplib.Internaldate2tuple(). Thanks Joe Peterson
  for the report and the patch.  Reviewed by Georg Brandl.
........
This commit is contained in:
Alexander Belopolsky 2011-01-29 18:43:43 +00:00
parent 7376c996d5
commit 87bb6e9b2f
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/imaplib.py
View file

@ -1266,8 +1266,8 @@ class _Authenticator:
Mon2num = {'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4, 'May': 5, 'Jun': 6, Mon2num = {b'Jan': 1, b'Feb': 2, b'Mar': 3, b'Apr': 4, b'May': 5, b'Jun': 6,
'Jul': 7, 'Aug': 8, 'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12} b'Jul': 7, b'Aug': 8, b'Sep': 9, b'Oct': 10, b'Nov': 11, b'Dec': 12}
def Internaldate2tuple(resp): def Internaldate2tuple(resp):
"""Convert IMAP4 INTERNALDATE to UT. """Convert IMAP4 INTERNALDATE to UT.
@ -1293,7 +1293,7 @@ def Internaldate2tuple(resp):
# INTERNALDATE timezone must be subtracted to get UT # INTERNALDATE timezone must be subtracted to get UT
zone = (zoneh*60 + zonem)*60 zone = (zoneh*60 + zonem)*60
if zonen == '-': if zonen == b'-':
zone = -zone zone = -zone
tt = (year, mon, day, hour, min, sec, -1, -1, -1) tt = (year, mon, day, hour, min, sec, -1, -1, -1)

11
Lib/test/test_imaplib.py
View file

@ -26,6 +26,17 @@ CERTFILE = None
class TestImaplib(unittest.TestCase): class TestImaplib(unittest.TestCase):
def test_Internaldate2tuple(self):
tt = imaplib.Internaldate2tuple(
b'25 (INTERNALDATE "01-Jan-1970 00:00:00 +0000")')
self.assertEqual(time.mktime(tt), 0)
tt = imaplib.Internaldate2tuple(
b'25 (INTERNALDATE "01-Jan-1970 11:30:00 +1130")')
self.assertEqual(time.mktime(tt), 0)
tt = imaplib.Internaldate2tuple(
b'25 (INTERNALDATE "31-Dec-1969 12:30:00 -1130")')
self.assertEqual(time.mktime(tt), 0)
def test_that_Time2Internaldate_returns_a_result(self): def test_that_Time2Internaldate_returns_a_result(self):
# We can check only that it successfully produces a result, # We can check only that it successfully produces a result,
# not the correctness of the result itself, since the result # not the correctness of the result itself, since the result

1
Misc/ACKS
View file

@ -611,6 +611,7 @@ Trevor Perrin
Gabriel de Perthuis Gabriel de Perthuis
Tim Peters Tim Peters
Benjamin Peterson Benjamin Peterson
Joe Peterson
Chris Petrilli Chris Petrilli
Bjorn Pettersen Bjorn Pettersen
Geoff Philbrick Geoff Philbrick