diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 16:01:11 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 16:01:11 (GMT) |
| commit | f9ad7d476ab288ef9fef5c1812ac5acf544e36a3 (patch) | |
| tree | cdb5e7f2b1586cce740ad377c1bc4037417afeae | |
| parent | 6233b36d142572ca35b3563657c539210c554dd6 (diff) | |
| download | cpython-f9ad7d476ab288ef9fef5c1812ac5acf544e36a3.zip cpython-f9ad7d476ab288ef9fef5c1812ac5acf544e36a3.tar.gz cpython-f9ad7d476ab288ef9fef5c1812ac5acf544e36a3.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 d70b59f..b4d12b4 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -230,7 +230,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) def test_main(): |