summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-07-10 15:17:08 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-07-10 15:17:08 (GMT)
commit9d8c456696eb29a35ccca0e6705d7c5158683a2a (patch)
tree709623018a652d18effb8235cbb3d8c7770a1178 /Lib
parente800b27519c11a01b77c29ad7d653031e930a657 (diff)
downloadcpython-9d8c456696eb29a35ccca0e6705d7c5158683a2a.zip
cpython-9d8c456696eb29a35ccca0e6705d7c5158683a2a.tar.gz
cpython-9d8c456696eb29a35ccca0e6705d7c5158683a2a.tar.bz2
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 ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_struct.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 816cedb..5a63135 100644
--- a/Lib/test/test_struct.py
+++ b/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