summaryrefslogtreecommitdiff
path: root/Lib/test/test_struct.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-07-09 13:21:35 +0000
committerBenjamin Peterson <benjamin@python.org>2010-07-09 13:21:35 +0000
commit306d88fc761560ced3765107d07c503c48637336 (patch)
tree7314409a818307752341d6305e963a1732b5d0b5 /Lib/test/test_struct.py
parent6251496e98f41cfcc9e86e24f6bf7a5c652aebb6 (diff)
downloadcpython-git-306d88fc761560ced3765107d07c503c48637336.tar.gz
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 ........
Diffstat (limited to 'Lib/test/test_struct.py')
-rw-r--r--Lib/test/test_struct.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index f376ac3a9d..e5241b3527 100644
--- 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