diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2020-01-15 23:50:46 -0600 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2020-01-15 23:50:46 -0600 |
| commit | 4ca56dafbf3b4a146a1a2951f2829e01baa41234 (patch) | |
| tree | 5bb654494dddf10bdaaeae92c746cc47afafba02 | |
| parent | 9e892cc22e28da9439c90e291ec2c67da810df65 (diff) | |
| download | numpy-4ca56dafbf3b4a146a1a2951f2829e01baa41234.tar.gz | |
MAINT: Remove duplicate deprecation of fastclip
| -rw-r--r-- | numpy/core/src/multiarray/calculation.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/numpy/core/src/multiarray/calculation.c b/numpy/core/src/multiarray/calculation.c index b9ed5a9e8..92ab75053 100644 --- a/numpy/core/src/multiarray/calculation.c +++ b/numpy/core/src/multiarray/calculation.c @@ -926,14 +926,15 @@ PyArray_Clip(PyArrayObject *self, PyObject *min, PyObject *max, PyArrayObject *o } } - /* NumPy 1.17.0, 2019-02-24 */ - if (DEPRECATE( - "->f->fastclip is deprecated. Use PyUFunc_RegisterLoopForDescr to " - "attach a custom loop to np.core.umath.clip, np.minimum, and " - "np.maximum") < 0) { - return NULL; - } - /* everything below can be removed once this deprecation completes */ + /* + * NumPy 1.17.0, 2019-02-24 + * NumPy 1.19.0, 2020-01-15 + * + * Setting `->f->fastclip to anything but NULL has been deprecated in 1.19 + * the code path below was previously deprecated since 1.17. + * (the deprecation moved to registration time instead of execution time) + * everything below can be removed once this deprecation completes + */ if (func == NULL || (min != NULL && !PyArray_CheckAnyScalar(min)) |