summaryrefslogtreecommitdiff
path: root/numpy/lib/histograms.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-06-27 10:34:54 -0600
committerGitHub <noreply@github.com>2018-06-27 10:34:54 -0600
commit72d2bc0b36478e06cc9d2f942f24308cabf1a22e (patch)
tree40d180bfbfe800d75e8c59aff86f9121e2b93ff0 /numpy/lib/histograms.py
parent7dace1d1d3418fed96b0552f1dadb4fe82a23796 (diff)
parent431740e8a04855f8cdf2f720752e462a9cf69269 (diff)
downloadnumpy-72d2bc0b36478e06cc9d2f942f24308cabf1a22e.tar.gz
Merge pull request #11428 from eric-wieser/deprecate-normed-1.15.0
BUG: Fix incorrect deprecation logic for histogram(normed=...) (master)
Diffstat (limited to 'numpy/lib/histograms.py')
-rw-r--r--numpy/lib/histograms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/histograms.py b/numpy/lib/histograms.py
index 337957dd5..ad7215504 100644
--- a/numpy/lib/histograms.py
+++ b/numpy/lib/histograms.py
@@ -782,7 +782,7 @@ def histogram(a, bins=10, range=None, normed=None, weights=None,
"The normed argument is ignored when density is provided. "
"In future passing both will result in an error.",
DeprecationWarning, stacklevel=2)
- normed = False
+ normed = None
if density:
db = np.array(np.diff(bin_edges), float)