Merged revisions 80126 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80126 | benjamin.peterson | 2010-04-16 17:35:38 -0500 (Fri, 16 Apr 2010) | 1 line

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

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index c27cc3abba6d9d3aaf5ed42250b76212fc1d626e..06ff4c96c68b01be3c5c24e73d55dc4fc331024c 100644 (file)
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -75,6 +75,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)

diff --git a/Misc/NEWS b/Misc/NEWS
index 81683c98c593eccde4026e495a25004c55f48bbf..7e30651a473112768559a4d33040c008296a2486 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is
+  passed to bytes or bytearray.
+
 - Issue #7301: Add environment variable $PYTHONWARNINGS.
 
 - Issue #8329: Don't return the same lists from select.select when no fds are

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 8f833d8efdd496bcf29f8db85c9c3d4f0cf9a1d3..4d32ea70f3d5b8cb99ac2eb030d3ac7c651f670b 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -753,14 +753,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;

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 890d0447df13305726e8c8d5f46b0bc287dc1d54..a05bf03d5676476d1b82e8c0b48e37a68d02e885 100644 (file)
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2545,15 +2545,17 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                return new;
        }
        /* Is it an integer? */
-       size = PyNumber_AsSsize_t(x, PyExc_ValueError);
+       size = PyNumber_AsSsize_t(x, PyExc_OverflowError);
        if (size == -1 && PyErr_Occurred()) {
+               if (PyErr_ExceptionMatches(PyExc_OverflowError))
+                       return NULL;
                PyErr_Clear();          
        }
+       else if (size < 0) {
+               PyErr_SetString(PyExc_ValueError, "negative count");
+               return NULL;
+       }
        else {
-               if (size < 0) {
-                       PyErr_SetString(PyExc_ValueError, "negative count");
-                       return NULL;
-               }
                new = PyBytes_FromStringAndSize(NULL, size);
                if (new == NULL) {
                        return NULL;