From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 10 Jul 2010 15:17:08 +0000 (+0000)
Subject: Merged revisions 82777 via svnmerge from
X-Git-Tag: v2.7.1rc1~618
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d8c456696eb29a35ccca0e6705d7c5158683a2a;p=python

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

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 816cedbb11..5a63135a1a 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