From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Tue, 15 Feb 2011 15:58:04 +0000 (+0000)
Subject: Merged revisions 87921 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=622ce124b6771c27273cf2ff173d44780d775b16;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index d4f7d8002f1b..b68cd6a74430 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):