Kaydet (Commit) e2748640 authored tarafından Barry Warsaw's avatar Barry Warsaw

test_formatdate(): Integrating Jack's 22b2 branch fix for Mac epoch:

    More changes to the formatdate epoch test: the Mac epoch is in
    localtime, so east of GMT it falls in 1903:-( Changed the test to
    obtain the epoch in both local time and GMT, and do the right
    thing in the comparisons. As a sanity measure also check that
    day/month is Jan 1.
üst beafc795
...@@ -921,12 +921,13 @@ class TestMiscellaneous(unittest.TestCase): ...@@ -921,12 +921,13 @@ class TestMiscellaneous(unittest.TestCase):
def test_formatdate(self): def test_formatdate(self):
now = 1005327232.109884 now = 1005327232.109884
epoch = time.gmtime(0)[0] gm_epoch = time.gmtime(0)[0:3]
loc_epoch = time.localtime(0)[0:3]
# When does the epoch start? # When does the epoch start?
if epoch == 1970: if gm_epoch == (1970, 1, 1):
# traditional Unix epoch # traditional Unix epoch
matchdate = 'Fri, 09 Nov 2001 17:33:52 -0000' matchdate = 'Fri, 09 Nov 2001 17:33:52 -0000'
elif epoch == 1904: elif loc_epoch == (1904, 1, 1):
# Mac epoch # Mac epoch
matchdate = 'Sat, 09 Nov 1935 16:33:52 -0000' matchdate = 'Sat, 09 Nov 1935 16:33:52 -0000'
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment