Return error from array_view for numpy scalars

jkseppan · jkseppan · commit 16a1e0671fe1 · 2015-09-20T18:37:45.000+03:00
Unless ND==0, in which case return success but don't clobber
the m_shape and m_strides members.
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -443,13 +443,17 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                 m_data = NULL;
                 m_shape = zeros;
                 m_strides = zeros;
-            } else if (PyArray_NDIM(tmp) != ND) {
-                PyErr_Format(PyExc_ValueError,
-                             "Expected %d-dimensional array, got %d",
-                             ND,
-                             PyArray_NDIM(tmp));
-                Py_DECREF(tmp);
-                return 0;
+		if (PyArray_NDIM(tmp) == 0 && ND == 0) {
+		    return 1;
+		}
+            }
+	    if (PyArray_NDIM(tmp) != ND) {
+		PyErr_Format(PyExc_ValueError,
+			     "Expected %d-dimensional array, got %d",
+			     ND,
+			     PyArray_NDIM(tmp));
+		Py_DECREF(tmp);
+		return 0;
             }
 
             /* Copy some of the data to the view object for faster access */
