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.
........
This commit is contained in:
Mark Dickinson 2009-02-10 16:13:25 +00:00
parent eeba356308
commit 21776074cc
6 changed files with 39 additions and 10 deletions

View file

@ -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'