From: Georg Brandl <georg@python.org>
Date: Tue, 4 Jan 2011 17:27:13 +0000 (+0000)
Subject: Fix exception catching.
X-Git-Tag: v3.2rc1~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fb97ae0f7ebcc723c59e5fe0d2826bb9c595d6f;p=thirdparty%2FPython%2Fcpython.git

Fix exception catching.
---

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 9d14827597d7..f2ce5cb1512f 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -142,7 +142,7 @@ class TimeTestCase(unittest.TestCase):
         self.assertEqual(time.ctime(t), 'Sat Jan  1 00:00:00 2000')
         try:
             bigval = time.mktime((10000, 1, 10) + (0,)*6)
-        except ValueError, OverflowError:
+        except (ValueError, OverflowError):
             # If mktime fails, ctime will fail too.  This may happen
             # on some platforms.
             pass