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

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Jul  9 15:21:35 2010
New Revision: 82736

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


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	Fri Jul  9 15:21:35 2010
@@ -243,7 +243,8 @@
                                                                  '\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