diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 15:58:04 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 15:58:04 (GMT) |
| commit | 622ce124b6771c27273cf2ff173d44780d775b16 (patch) | |
| tree | f01072997cbb2b2d0f105b988048495b565e7310 | |
| parent | 4fb96f41f4525c25dcba386db96e5298e563cf65 (diff) | |
| download | cpython-622ce124b6771c27273cf2ff173d44780d775b16.zip cpython-622ce124b6771c27273cf2ff173d44780d775b16.tar.gz cpython-622ce124b6771c27273cf2ff173d44780d775b16.tar.bz2 | |
Merged revisions 87921 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87921 | alexander.belopolsky | 2011-01-10 21:22:16 -0500 (Mon, 10 Jan 2011) | 1 line
This should fix mktime test on Windows
........
| -rw-r--r-- | Lib/test/test_time.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index d4f7d80..b68cd6a 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -240,7 +240,8 @@ class TimeTestCase(unittest.TestCase): tt = time.localtime(t) except (OverflowError, ValueError): pass - self.assertEqual(time.mktime(tt), t) + else: + self.assertEqual(time.mktime(tt), t) class TestLocale(unittest.TestCase): def setUp(self): |