commit 9bbf8369d1fd679ced4f1b8ba02c265f113b8401
author Georg Brandl <georg@python.org> Sun Feb 07 13:02:10 2010 +0000
committer Georg Brandl <georg@python.org> Sun Feb 07 13:02:10 2010 +0000
tree 7a12abc0c7821f706bd6575321e0350b44ca7d26
parent 9c2c1f8071b1fc255ca482dae5c89907b7fb5c91

Merged revisions 78075-78079 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78075 | georg.brandl | 2010-02-07 13:16:12 +0100 (So, 07 Feb 2010) | 1 line

  Fix another duplicated test method.
........
  r78076 | georg.brandl | 2010-02-07 13:19:43 +0100 (So, 07 Feb 2010) | 1 line

  Fix wrong usage of "except X, Y:".
........
  r78077 | georg.brandl | 2010-02-07 13:25:50 +0100 (So, 07 Feb 2010) | 1 line

  Fix two redefined test methods.
........
  r78078 | georg.brandl | 2010-02-07 13:27:06 +0100 (So, 07 Feb 2010) | 1 line

  Fix a redefined test method.
........
  r78079 | georg.brandl | 2010-02-07 13:34:26 +0100 (So, 07 Feb 2010) | 1 line

  Add a minimal test for fnmatchcase().
........

Lib/test/test_optparse.py

diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index f27864a..5f585a6 100644
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -459,7 +459,7 @@
             return int(value)
         else:
             return int(value[:-1]) * _time_units[value[-1]]
-    except ValueError, IndexError:
+    except (ValueError, IndexError):
         raise OptionValueError(
             'option %s: invalid duration: %r' % (opt, value))