diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-06-27 10:34:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 10:34:54 -0600 |
| commit | 72d2bc0b36478e06cc9d2f942f24308cabf1a22e (patch) | |
| tree | 40d180bfbfe800d75e8c59aff86f9121e2b93ff0 /numpy | |
| parent | 7dace1d1d3418fed96b0552f1dadb4fe82a23796 (diff) | |
| parent | 431740e8a04855f8cdf2f720752e462a9cf69269 (diff) | |
| download | numpy-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')
| -rw-r--r-- | numpy/lib/histograms.py | 2 | ||||
| -rw-r--r-- | numpy/lib/tests/test_histograms.py | 4 |
2 files changed, 5 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) diff --git a/numpy/lib/tests/test_histograms.py b/numpy/lib/tests/test_histograms.py index 9bea2aca8..d22aa5a27 100644 --- a/numpy/lib/tests/test_histograms.py +++ b/numpy/lib/tests/test_histograms.py @@ -78,6 +78,10 @@ class TestHistogram(object): assert_array_equal(a, .1) assert_equal(np.sum(a * np.diff(b)), 1) + # Test that passing False works too + a, b = histogram(v, bins, density=False) + assert_array_equal(a, [1, 2, 3, 4]) + # Variale bin widths are especially useful to deal with # infinities. v = np.arange(10) |