summaryrefslogtreecommitdiff
path: root/numpy/lib/nanfunctions.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-09-14 14:24:04 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-09-14 14:24:04 -0700
commit6ce65d8f4a03a73fff6547cbdfa8d628214cb1b9 (patch)
treee469c75837abb6292309b9e9be54ff764e9fdf3f /numpy/lib/nanfunctions.py
parent4d53e8bef0915d08f260ca62fbc5b2ce3b8ec970 (diff)
parent4f535ff399a84ba5bdad3630120d6c5b86689d6b (diff)
downloadnumpy-6ce65d8f4a03a73fff6547cbdfa8d628214cb1b9.tar.gz
Merge pull request #3746 from charris/fix-nansum-documentation
DOC: Make documentation of nansum current with 1.9.
Diffstat (limited to 'numpy/lib/nanfunctions.py')
-rw-r--r--numpy/lib/nanfunctions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/nanfunctions.py b/numpy/lib/nanfunctions.py
index 818119eee..44cc2b163 100644
--- a/numpy/lib/nanfunctions.py
+++ b/numpy/lib/nanfunctions.py
@@ -401,8 +401,8 @@ def nansum(a, axis=None, dtype=None, out=None, keepdims=0):
Return the sum of array elements over a given axis treating
Not a Numbers (NaNs) as zero.
- FutureWarning: In Numpy versions <= 1.8 Nan is returned for slices that
- are all-NaN or empty. In later versions zero will be returned.
+ In Numpy versions <= 1.8 Nan is returned for slices that
+ are all-NaN or empty. In later versions zero is returned.
Parameters
----------