diff options
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/overrides.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/arrayfunction_override.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 8 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.h | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_overrides.py | 14 |
5 files changed, 14 insertions, 14 deletions
diff --git a/numpy/core/overrides.py b/numpy/core/overrides.py index ee713320c..d4697b8a6 100644 --- a/numpy/core/overrides.py +++ b/numpy/core/overrides.py @@ -152,7 +152,7 @@ def array_function_dispatch(dispatcher, module=None, verify=True, if module is not None: public_api.__module__ = module - public_api.__numpy_implementation__ = implementation + public_api.__skip_array_function__ = implementation return public_api diff --git a/numpy/core/src/multiarray/arrayfunction_override.c b/numpy/core/src/multiarray/arrayfunction_override.c index 9a9d180c5..02078306c 100644 --- a/numpy/core/src/multiarray/arrayfunction_override.c +++ b/numpy/core/src/multiarray/arrayfunction_override.c @@ -173,7 +173,7 @@ array_function_method_impl(PyObject *func, PyObject *types, PyObject *args, } } - implementation = PyObject_GetAttr(func, npy_ma_str_numpy_implementation); + implementation = PyObject_GetAttr(func, npy_ma_str_skip_array_function); if (implementation == NULL) { return NULL; } diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index cf3054951..06e15225d 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -4493,7 +4493,7 @@ NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_array_prepare = NULL; NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_array_wrap = NULL; NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_array_finalize = NULL; NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_ufunc = NULL; -NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_numpy_implementation = NULL; +NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_skip_array_function = NULL; NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_order = NULL; NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_copy = NULL; NPY_VISIBILITY_HIDDEN PyObject * npy_ma_str_dtype = NULL; @@ -4509,8 +4509,8 @@ intern_strings(void) npy_ma_str_array_wrap = PyUString_InternFromString("__array_wrap__"); npy_ma_str_array_finalize = PyUString_InternFromString("__array_finalize__"); npy_ma_str_ufunc = PyUString_InternFromString("__array_ufunc__"); - npy_ma_str_numpy_implementation = PyUString_InternFromString( - "__numpy_implementation__"); + npy_ma_str_skip_array_function = PyUString_InternFromString( + "__skip_array_function__"); npy_ma_str_order = PyUString_InternFromString("order"); npy_ma_str_copy = PyUString_InternFromString("copy"); npy_ma_str_dtype = PyUString_InternFromString("dtype"); @@ -4520,7 +4520,7 @@ intern_strings(void) return npy_ma_str_array && npy_ma_str_array_prepare && npy_ma_str_array_wrap && npy_ma_str_array_finalize && - npy_ma_str_ufunc && npy_ma_str_numpy_implementation && + npy_ma_str_ufunc && npy_ma_str_skip_array_function && npy_ma_str_order && npy_ma_str_copy && npy_ma_str_dtype && npy_ma_str_ndmin && npy_ma_str_axis1 && npy_ma_str_axis2; } diff --git a/numpy/core/src/multiarray/multiarraymodule.h b/numpy/core/src/multiarray/multiarraymodule.h index 67504805c..5cf082fbb 100644 --- a/numpy/core/src/multiarray/multiarraymodule.h +++ b/numpy/core/src/multiarray/multiarraymodule.h @@ -6,7 +6,7 @@ NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_array_prepare; NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_array_wrap; NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_array_finalize; NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_ufunc; -NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_numpy_implementation; +NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_skip_array_function; NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_order; NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_copy; NPY_VISIBILITY_HIDDEN extern PyObject * npy_ma_str_dtype; diff --git a/numpy/core/tests/test_overrides.py b/numpy/core/tests/test_overrides.py index b895608cc..7f02399b2 100644 --- a/numpy/core/tests/test_overrides.py +++ b/numpy/core/tests/test_overrides.py @@ -190,8 +190,8 @@ class TestNDArrayArrayFunction(object): result = np.concatenate((array, override_sub)) assert_equal(result, expected.view(OverrideSub)) - def test_numpy_implementation(self): - assert_(dispatched_one_arg.__numpy_implementation__ + def test_skip_array_function(self): + assert_(dispatched_one_arg.__skip_array_function__ is dispatched_one_arg.__wrapped__) def test_no_wrapper(self): @@ -199,8 +199,8 @@ class TestNDArrayArrayFunction(object): # __array_function__ with invalid arguments, but check that we raise # an appropriate error all the same. array = np.array(1) - func = dispatched_one_arg.__numpy_implementation__ - with assert_raises_regex(AttributeError, '__numpy_implementation__'): + func = dispatched_one_arg.__skip_array_function__ + with assert_raises_regex(AttributeError, '__skip_array_function__'): array.__array_function__(func=func, types=(np.ndarray,), args=(array,), kwargs={}) @@ -386,7 +386,7 @@ class TestNumPyFunctions(object): assert_equal(np.sum(MyArray()), 'yes') def test_sum_implementation_on_list(self): - assert_equal(np.sum.__numpy_implementation__([1, 2, 3]), 6) + assert_equal(np.sum.__skip_array_function__([1, 2, 3]), 6) def test_sum_on_mock_array(self): @@ -410,7 +410,7 @@ class TestNumPyFunctions(object): proxy = ArrayProxy(mock.Mock(spec=ArrayProxy)) proxy.value.__array__.return_value = np.array(2) - result = np.sum.__numpy_implementation__(proxy) + result = np.sum.__skip_array_function__(proxy) assert_equal(result, 2) # TODO: switch to proxy.value.__array__.assert_called() and # proxy.value.__array_function__.assert_not_called() once we drop @@ -426,7 +426,7 @@ class TestNumPyFunctions(object): return 'summed' def __array_function__(self, func, types, args, kwargs): - return func.__numpy_implementation__(*args, **kwargs) + return func.__skip_array_function__(*args, **kwargs) # note: the internal implementation of np.sum() calls the .sum() method assert_equal(np.sum(MyArray()), 'summed') |