Fix ticket numpy#1058. Thanks to Russel.

msimpson253 · Mar 27, 2009 · 94b57c7 · 94b57c7
1 parent da8312a
commit 94b57c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c
@@ -7151,7 +7151,7 @@ PyArray_FromIter(PyObject *obj, PyArray_Descr *dtype, intp count)
               50% overallocation => 0, 4, 8, 14, 23, 36, 56, 86 ...
             */
             elcount = (i >> 1) + (i < 4 ? 4 : 2) + i;
-            if (elcount <= (intp)((~(size_t)0) / elsize)) {
+            if (elcount <= NPY_MAX_INTP/elsize) {
                 new_data = PyDataMem_RENEW(ret->data, elcount * elsize);
             }
             else {

diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
@@ -1275,5 +1275,12 @@ def test_huge_arange(self):
         except Exception, e:
             self.fail("Got exception of type %s instead of ValueError" % type(e))
 
+    def test_fromiter_bytes(self, level=rlevel):
+        """Ticket #1058"""
+        a = np.fromiter(range(10), dtype='b')
+        b = np.fromiter(range(10), dtype='B')
+        assert np.alltrue(a == np.array([0,1,2,3,4,5,6,7,8,9]))
+        assert np.alltrue(b == np.array([0,1,2,3,4,5,6,7,8,9]))
+
 if __name__ == "__main__":
     run_module_suite()