diff options
Diffstat (limited to 'scipy/base/src')
| -rw-r--r-- | scipy/base/src/arraytypes.inc.src | 1 | ||||
| -rw-r--r-- | scipy/base/src/multiarraymodule.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scipy/base/src/arraytypes.inc.src b/scipy/base/src/arraytypes.inc.src index 0275d56b1..a64552f0c 100644 --- a/scipy/base/src/arraytypes.inc.src +++ b/scipy/base/src/arraytypes.inc.src @@ -377,7 +377,6 @@ static int PyArray_CopyObject(PyArrayObject *, PyObject *); static int VOID_setitem(PyObject *op, char *ip, PyArrayObject *ap) { - PyObject *u=NULL; PyArray_Descr* descr; int itemsize=ap->descr->elsize; int res; diff --git a/scipy/base/src/multiarraymodule.c b/scipy/base/src/multiarraymodule.c index 825166e3b..55f68f1db 100644 --- a/scipy/base/src/multiarraymodule.c +++ b/scipy/base/src/multiarraymodule.c @@ -1608,9 +1608,9 @@ PyArray_Sort(PyArrayObject *op, int axis) SWAPAXES(op, ap); - ap = (PyArrayObject *)PyArray_CopyFromObject((PyObject *)op, - PyArray_NOTYPE, - 1, 0); + ap = (PyArrayObject *)PyArray_FromAny((PyObject *)op, + NULL, 1, 0, ENSURECOPY); + Py_DECREF(op); if (ap == NULL) return NULL; |