[Python-checkins] r82778 - in python/branches/release27-maint: Lib/test/test_struct.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Jul 10 17:17:08 2010
New Revision: 82778

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_struct.py

Modified: python/branches/release27-maint/Lib/test/test_struct.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_struct.py	(original)
+++ python/branches/release27-maint/Lib/test/test_struct.py	Sat Jul 10 17:17:08 2010
@@ -243,8 +243,8 @@
                                                                  '\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