summaryrefslogtreecommitdiff
path: root/doc/source/reference/arrays.maskna.rst
diff options
context:
space:
mode:
authorMark Wiebe <mwwiebe@gmail.com>2011-08-26 15:44:14 -0700
committerCharles Harris <charlesr.harris@gmail.com>2011-08-27 07:27:02 -0600
commit10fac981763e87f949bed15c66127fc380fa9b27 (patch)
tree9884131ece5eada06212538c591965bf5928afa2 /doc/source/reference/arrays.maskna.rst
parentf818910471ac900bd2a440ee35ded10756af5dad (diff)
downloadnumpy-10fac981763e87f949bed15c66127fc380fa9b27.tar.gz
ENH: missingdata: Make PyArray_Converter and PyArray_OutputConverter safer for legacy code
These functions now reject inputs with NA, and there are alternative functions PyArray_AllowNAConverter and PyArray_OutputAllowNAConverter that functions should use when they intend to support NA.
Diffstat (limited to 'doc/source/reference/arrays.maskna.rst')
-rw-r--r--doc/source/reference/arrays.maskna.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/source/reference/arrays.maskna.rst b/doc/source/reference/arrays.maskna.rst
index 29b38f131..2faabde83 100644
--- a/doc/source/reference/arrays.maskna.rst
+++ b/doc/source/reference/arrays.maskna.rst
@@ -58,7 +58,7 @@ as defined in the IEEE 754 floating point arithmetic specification.
Most computations whose input is NA will output NA as well, a property
known as propagation. Some operations, however, always produce the
same result no matter what the value of the NA is. The clearest
-example of this is with the logical operands *and* and *or*. Since both
+example of this is with the logical operations *and* and *or*. Since both
np.logical_or(True, True) and np.logical_or(False, True) are True,
all possible boolean values on the left hand side produce the
same answer. This means that np.logical_or(np.NA, True) can produce