diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-02-10 16:13:25 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-02-10 16:13:25 (GMT) |
| commit | 21776074cc300dbdea412aa57cb6efdd126dcff6 (patch) | |
| tree | 572f170fc1e492de76de035241f3d77228c9c171 /Lib/test/test_struct.py | |
| parent | eeba356308cd6e6e11ed8c50e5d6ebac32b42e1c (diff) | |
| download | cpython-21776074cc300dbdea412aa57cb6efdd126dcff6.zip cpython-21776074cc300dbdea412aa57cb6efdd126dcff6.tar.gz cpython-21776074cc300dbdea412aa57cb6efdd126dcff6.tar.bz2 | |
Merged revisions 69498 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69498 | mark.dickinson | 2009-02-10 15:46:50 +0000 (Tue, 10 Feb 2009) | 6 lines
Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError for
negative arguments. Previously, it raised TypeError.
Thanks Lisandro Dalcin.
........
Diffstat (limited to 'Lib/test/test_struct.py')
| -rw-r--r-- | Lib/test/test_struct.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index bdbc397..2bc92f3 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -48,7 +48,7 @@ def with_warning_restore(func): def deprecated_err(func, *args): try: func(*args) - except (struct.error, TypeError): + except (struct.error, OverflowError): pass except DeprecationWarning: if not PY_STRUCT_OVERFLOW_MASKING: @@ -191,7 +191,7 @@ class StructTest(unittest.TestCase): def test_native_qQ(self): # can't pack -1 as unsigned regardless - self.assertRaises((struct.error, TypeError), struct.pack, "Q", -1) + self.assertRaises((struct.error, OverflowError), struct.pack, "Q", -1) # can't pack string as 'q' regardless self.assertRaises(struct.error, struct.pack, "q", "a") # ditto, but 'Q' |