have a clear error when passing something > sys.maxsize to bytearray

This commit is contained in:
Benjamin Peterson 2010-04-16 22:35:38 +00:00
parent 5c4e292c14
commit 821a8ea39f
3 changed files with 15 additions and 7 deletions

View File

@ -73,6 +73,7 @@ class BaseBytesTest(unittest.TestCase):
self.assertEqual(self.type2test('0', 'ascii'), b'0')
self.assertEqual(self.type2test(b'0'), b'0')
self.assertRaises(OverflowError, self.type2test, sys.maxsize + 1)
def test_constructor_type_errors(self):
self.assertRaises(TypeError, self.type2test, 0.0)

View File

@ -12,6 +12,9 @@ What's New in Python 2.7 beta 2?
Core and Builtins
-----------------
- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is
passed to bytearray.
Library
-------

View File

@ -824,14 +824,18 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
}
/* Is it an int? */
count = PyNumber_AsSsize_t(arg, PyExc_ValueError);
if (count == -1 && PyErr_Occurred())
PyErr_Clear();
else {
if (count < 0) {
PyErr_SetString(PyExc_ValueError, "negative count");
count = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
if (count == -1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_OverflowError))
return -1;
}
else
PyErr_Clear();
}
else if (count < 0) {
PyErr_SetString(PyExc_ValueError, "negative count");
return -1;
}
else {
if (count > 0) {
if (PyByteArray_Resize((PyObject *)self, count))
return -1;