diff options
author | Darren Dale <dsdale24@gmail.com> | 2009-08-25 18:10:21 +0000 |
---|---|---|
committer | Darren Dale <dsdale24@gmail.com> | 2009-08-25 18:10:21 +0000 |
commit | 0abf640f4a8f0f48fe2fcd1e43bbe7b4eabbc9cf (patch) | |
tree | 0316d56eeab9c89def52017ca379c86e1b061686 /numpy | |
parent | ae6aa8d4d2527cc6810cc1e430269719f81e821b (diff) | |
download | numpy-0abf640f4a8f0f48fe2fcd1e43bbe7b4eabbc9cf.tar.gz |
fix a minor mistake in the previous commit
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/src/multiarray/methods.c | 25 | ||||
-rw-r--r-- | numpy/doc/subclassing.py | 2 |
2 files changed, 1 insertions, 26 deletions
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c index 8ec256105..de99ca137 100644 --- a/numpy/core/src/multiarray/methods.c +++ b/numpy/core/src/multiarray/methods.c @@ -756,31 +756,6 @@ array_cast(PyArrayObject *self, PyObject *args) static PyObject * -array_preparearray(PyArrayObject *self, PyObject *args) -{ - PyObject *arr; - PyObject *ret; - - if (PyTuple_Size(args) < 1) { - PyErr_SetString(PyExc_TypeError, - "only accepts 1 argument"); - return NULL; - } - arr = PyTuple_GET_ITEM(args, 0); - if (arr == NULL) { - return NULL; - } - if (!PyArray_Check(arr)) { - PyErr_SetString(PyExc_TypeError, - "can only be called with ndarray object"); - return NULL; - } - Py_INCREF(arr); - return arr; -} - - -static PyObject * array_wraparray(PyArrayObject *self, PyObject *args) { PyObject *arr; diff --git a/numpy/doc/subclassing.py b/numpy/doc/subclassing.py index 24f0108d7..de0338060 100644 --- a/numpy/doc/subclassing.py +++ b/numpy/doc/subclassing.py @@ -420,7 +420,7 @@ So: .. _array-wrap: -``__array_prepare__`` and ``__array_wrap__`` for ufuncs +``__array_wrap__`` for ufuncs ------------------------------------------------------- ``__array_wrap__`` gets called at the end of numpy ufuncs and other numpy |