diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-02-22 00:02:09 +0000 |
|---|---|---|
| committer | Tyler Reddy <tyler.je.reddy@gmail.com> | 2019-04-16 14:37:57 -0700 |
| commit | e03249a76c21904f033ec1c25d8f43d03d9e31fa (patch) | |
| tree | 577e15517bcc3b5026694f336f593bbed492bd14 | |
| parent | 4c977804b4eaadf5ac1b4eb1024f8167657e976d (diff) | |
| download | numpy-e03249a76c21904f033ec1c25d8f43d03d9e31fa.tar.gz | |
ENH: preserve subclasses in ufunc.outer
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index dd5fb7e03..958e99e17 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -5428,7 +5428,7 @@ ufunc_outer(PyUFuncObject *ufunc, PyObject *args, PyObject *kwds) if (tmp == NULL) { return NULL; } - ap1 = (PyArrayObject *) PyArray_FromObject(tmp, NPY_NOTYPE, 0, 0); + ap1 = (PyArrayObject *) PyArray_FROM_O(tmp); Py_DECREF(tmp); if (ap1 == NULL) { return NULL; @@ -5437,7 +5437,7 @@ ufunc_outer(PyUFuncObject *ufunc, PyObject *args, PyObject *kwds) if (tmp == NULL) { return NULL; } - ap2 = (PyArrayObject *)PyArray_FromObject(tmp, NPY_NOTYPE, 0, 0); + ap2 = (PyArrayObject *) PyArray_FROM_O(tmp); Py_DECREF(tmp); if (ap2 == NULL) { Py_DECREF(ap1); |