Merge branch 'master' into ctypes-no-hasattr

serhiy-storchaka · Dec 5, 2018 · Sep 24, 2017 · Nov 11, 2017 · Nov 11, 2017 · Nov 11, 2017
commit 4cf77fe357a05dd831961f1d31f129478484d1ef
diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py
@@ -190,10 +190,12 @@ class T(Array):
             class T(Array):
                 _type_ = c_int
                 _length_ = sys.maxsize * 2
-        with self.assertRaises(TypeError):
-            class T(Array):
-                _type_ = c_int
-                _length_ = 1.87
+
+    def test_zero_length(self):
+        # _length_ can be zero.
+        class T(Array):
+            _type_ = c_int
+            _length_ = 0
 
     @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
     @bigmemtest(size=_2G, memuse=1, dry_run=False)

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -1434,12 +1434,6 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                         "class must define a '_length_' attribute");
         goto error;
     }
-    if (!PyLong_Check(length_attr)) {
-        PyErr_SetString(PyExc_TypeError,
-                        "The '_length_' attribute must be a positive integer");
-        Py_DECREF(length_attr);
-        goto error;
-    }
 
     if (!PyLong_Check(length_attr)) {
         Py_DECREF(length_attr);