Merged revisions 82735 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82735 | benjamin.peterson | 2010-07-09 08:20:40 -0500 (Fri, 09 Jul 2010) | 1 line

  OverflowError is fine
........

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index f376ac3a9d4ee76cd92f33be9da03d57ca01b561..e5241b35272779c139a8ee09a38a60b12c31ad2e 100644 (file)
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -243,7 +243,8 @@ class StructTest(unittest.TestCase):
                                                                  '\x01' + got)
                 else:
                     # x is out of range -- verify pack realizes that.
-                    self.assertRaises(struct.error, pack, format, x)
+                    self.assertRaises((OverflowError, struct.error), pack,
+                                      format, x)
 
             def run(self):
                 from random import randrange