summaryrefslogtreecommitdiff
path: root/doc/neps
diff options
context:
space:
mode:
authorStephan Hoyer <shoyer@google.com>2018-09-13 17:26:44 -0700
committerStephan Hoyer <shoyer@google.com>2018-09-13 17:26:44 -0700
commit36e6b96576a16d827fe8b72df493923547f87eca (patch)
tree62221e185099321c802fa5cd2830811ea8ec77ef /doc/neps
parent3459cff277dc9c4572e7447faa15079e12035c80 (diff)
downloadnumpy-36e6b96576a16d827fe8b72df493923547f87eca.tar.gz
DOC: switch order of checking for new protocls
Diffstat (limited to 'doc/neps')
-rw-r--r--doc/neps/nep-0018-array-function-protocol.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/neps/nep-0018-array-function-protocol.rst b/doc/neps/nep-0018-array-function-protocol.rst
index a03827e35..e0f1113f6 100644
--- a/doc/neps/nep-0018-array-function-protocol.rst
+++ b/doc/neps/nep-0018-array-function-protocol.rst
@@ -559,11 +559,11 @@ experimental status.
Switching to a new protocol should use an abbreviated version of NumPy's
normal deprecation cycle:
-- For a single major release, NumPy should check for ``__array_function__``
- methods that implement the given function, followed by checks for the new
- protocol. If any argument returns a value other than ``NotImplemented``
- from ``__array_function__``, a descriptive ``FutureWarning`` should be
- raised.
+- For a single major release, after checking for any new protocols, NumPy
+ should still check for ``__array_function__`` methods that implement the
+ given function. If any argument returns a value other than
+ ``NotImplemented`` from ``__array_function__``, a descriptive
+ ``FutureWarning`` should be issued.
- In the next major release, the checks for ``__array_function__`` will be
removed.