diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-08 07:49:10 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-08 07:49:10 +0000 |
| commit | 3e3dd665d89496da053f76f120d504e9f1bf1699 (patch) | |
| tree | 46d7ffc835856c2520958562081fdbf67a476dd4 /numpy/core | |
| parent | 50a50441a148a9ea3fbc1629e065d88a4f28a419 (diff) | |
| download | numpy-3e3dd665d89496da053f76f120d504e9f1bf1699.tar.gz | |
Add numarray compatibility.
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index fde0b1e28..af923002d 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -4377,12 +4377,13 @@ PyArray_DescrConverter(PyObject *obj, PyArray_Descr **at) } return PY_SUCCEED; } - else goto fail; /*{ + else if (PyArray_Check(obj)) goto fail; + else /* goto fail;*/ { *at = _arraydescr_fromobj(obj); if (*at) return PY_SUCCEED; if (PyErr_Occurred()) return PY_FAIL; goto fail; - } */ + } if (PyErr_Occurred()) goto fail; /* |