Merge pull request #14045 from charris/backport-13757

charris · web-flow · commit ca0ef6f54d21 · 2019-07-17T15:39:47.000-05:00
MAINT: fix histogram*d dispatchers
diff --git a/numpy/lib/histograms.py b/numpy/lib/histograms.py
@@ -3,6 +3,7 @@
 """
 from __future__ import division, absolute_import, print_function
 
+import contextlib
 import functools
 import operator
 import warnings
@@ -918,7 +919,15 @@ def histogram(a, bins=10, range=None, normed=None, weights=None,
 
 def _histogramdd_dispatcher(sample, bins=None, range=None, normed=None,
                             weights=None, density=None):
-    return (sample, bins, weights)
+    if hasattr(sample, 'shape'):  # same condition as used in histogramdd
+        yield sample
+    else:
+        for s in sample:
+            yield s
+    with contextlib.suppress(TypeError):
+        for b in bins:
+            yield b
+    yield weights
 
 
 @array_function_dispatch(_histogramdd_dispatcher)
diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py
@@ -565,7 +565,21 @@ def vander(x, N=None, increasing=False):
 
 def _histogram2d_dispatcher(x, y, bins=None, range=None, normed=None,
                             weights=None, density=None):
-    return (x, y, bins, weights)
+    yield x
+    yield y
+
+    # This terrible logic is adapted from the checks in histogram2d
+    try:
+        N = len(bins)
+    except TypeError:
+        N = 1
+    if N != 1 and N != 2:
+        for b in bins:
+            yield b
+    else:
+        yield bins
+
+    yield weights
 
 
 @array_function_dispatch(_histogram2d_dispatcher)
