Special check for common error in arange.

1 files changed, 9 insertions, 1 deletions

diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c
index 3042a88b8..2b690bae8 100644
--- a/numpy/core/src/multiarraymodule.c
+++ b/numpy/core/src/multiarraymodule.c
@@ -6641,7 +6641,15 @@ _calc_length(PyObject *start, PyObject *stop, PyObject *step, PyObject **next, i
 	double value;
 
 	*next = PyNumber_Subtract(stop, start);
-	if (!(*next)) return -1;
+	if (!(*next)) {
+                if (PyTuple_Check(stop)) {
+                        PyErr_Clear();
+                        PyErr_SetString(PyExc_TypeError, 
+                                        "arange: scalar arguments expected "\
+                                        "instead of a tuple.");
+                }
+                return -1;
+        }
 	val = PyNumber_TrueDivide(*next, step);
 	Py_DECREF(*next); *next=NULL;
 	if (!val) return -1;