PyArray_FromBuffer: Allow creating arrays from empty buffers or empty…

… slices.
zonca · Oct 1, 2011 · dadf7ed · dadf7ed
1 parent 10ed90c
commit dadf7ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
@@ -3610,10 +3610,10 @@ PyArray_FromBuffer(PyObject *buf, PyArray_Descr *type,
         }
     }
 
-    if ((offset < 0) || (offset >= ts)) {
+    if ((offset < 0) || (offset > ts)) {
         PyErr_Format(PyExc_ValueError,
-                     "offset must be non-negative and smaller than buffer "\
-                     "lenth (%" INTP_FMT ")", (npy_intp)ts);
+                     "offset must be non-negative and no greater than buffer "\
+                     "length (%" INTP_FMT ")", (npy_intp)ts);
         Py_DECREF(buf);
         Py_DECREF(type);
         return NULL;

diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
@@ -1350,6 +1350,9 @@ def test_ip_basic(self):
                 buf = x.tostring()
                 yield self.tst_basic,buf,x.flat,{'dtype':dt}
 
+    def test_empty(self):
+        yield self.tst_basic, '', np.array([]), {}
+
 
 class TestResize(TestCase):
     def test_basic(self):