BUG: cannot convert invalid sequence index to tuple

seberg · seberg · commit c85dd45b42d2 · 2014-09-13T13:35:15.000+02:00
A sequence which raises an error on item getting, should be just handled as a single index and not a tuple nd-index. Also fix some error handling. closes numpygh-5063
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
@@ -206,14 +206,17 @@ prepare_index(PyArrayObject *self, PyObject *index,
             n = 0;
             make_tuple = 1;
         }
-        n = PySequence_Size(index);
+        else {
+            n = PySequence_Size(index);
+        }
         if (n < 0 || n >= NPY_MAXDIMS) {
             n = 0;
         }
         for (i = 0; i < n; i++) {
             PyObject *tmp_obj = PySequence_GetItem(index, i);
             if (tmp_obj == NULL) {
-                make_tuple = 1;
+                PyErr_Clear();
+                make_tuple = 0;
                 break;
             }
             if (PyArray_Check(tmp_obj) || PySequence_Check(tmp_obj)
