Merge remote-tracking branch 'upstream/v1.3.x'

tacaswell · tacaswell · commit 97b52510c753 · 2014-02-26T21:21:31.000-05:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5654,10 +5654,11 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 if log:
                     y[y < minimum] = minimum
                 if orientation == 'horizontal':
-                    x, y = y, x
-
-                xvals.append(x.copy())
-                yvals.append(y.copy())
+                    xvals.append(y.copy())
+                    yvals.append(x.copy())
+                else:
+                    xvals.append(x.copy())
+                    yvals.append(y.copy())
 
             if fill:
                 # add patches in reverse order so that when stacking,
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_step_horiz.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_step_horiz.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1473,6 +1473,16 @@ def test_hist_step():
     ax.set_xlim(-1, 5)
 
 
+@image_comparison(baseline_images=['hist_step_horiz'], extensions=['png'])
+def test_hist_step_horiz():
+    # make some data
+    d1 = np.linspace(0, 10, 50)
+    d2 = np.linspace(1, 3, 20)
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.hist( (d1, d2), histtype="step", orientation="horizontal")
+
+
 @image_comparison(baseline_images=['hist_stacked_weights'])
 def test_hist_stacked_weighted():
     # make some data
