Merged revisions 82777 via svnmerge from

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

........
  r82777 | benjamin.peterson | 2010-07-10 10:14:45 -0500 (Sat, 10 Jul 2010) | 1 line

  ValueError is eventually what we want to move to, I suppose
........

Lib/test/test_struct.py

@@ -243,8 +243,8 @@ class StructTest(unittest.TestCase):
                                                                  '\x01' + got)
                 else:
                     # x is out of range -- verify pack realizes that.
-                    self.assertRaises((OverflowError, struct.error), pack,
-                                      format, x)
+                    self.assertRaises((OverflowError, ValueError, struct.error),
+                                      pack, format, x)
 
             def run(self):
                 from random import randrange