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

mdboom · mdboom · commit 6a1b88c2cc39 · 2013-11-29T12:22:06.000-05:00
Conflicts:
	lib/matplotlib/axes/_axes.py
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5245,7 +5245,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
         hist_kwargs = dict(range=bin_range)
 
         n = []
-        mlast = bottom
+        mlast = None
         for i in xrange(nx):
             # this will automatically overwrite bins,
             # so that each histogram uses the same bins
@@ -5257,6 +5257,8 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 db = np.diff(bins)
                 m = (m.astype(float) / db) / m.sum()
             if stacked:
+                if mlast is None:
+                    mlast = np.zeros(len(bins)-1, m.dtype)
                 m += mlast
                 mlast[:] = m
             n.append(m)
@@ -5347,6 +5349,12 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             x[0:2*len(bins)-1:2], x[1:2*len(bins)-1:2] = bins, bins[:-1]
             x[2*len(bins)-1:] = x[1:2*len(bins)-1][::-1]
 
+            if bottom is None:
+                bottom = np.zeros(len(bins)-1, np.float)
+
+            y[1:2*len(bins)-1:2], y[2:2*len(bins):2] = bottom, bottom
+            y[2*len(bins)-1:] = y[1:2*len(bins)-1][::-1]
+
             if log:
                 if orientation == 'horizontal':
                     self.set_xscale('log', nonposx='clip')
@@ -5382,12 +5390,13 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
 
             xvals, yvals = [], []
             for m in n:
-                # starting point for drawing polygon
-                y[0] = y[1]
-                # top of the previous polygon becomes the bottom
-                y[2*len(bins)-1:] = y[1:2*len(bins)-1][::-1]
+                if stacked:
+                    # starting point for drawing polygon
+                    y[0] = y[1]
+                    # top of the previous polygon becomes the bottom
+                    y[2*len(bins)-1:] = y[1:2*len(bins)-1][::-1]
                 # set the top of this polygon
-                y[1:2*len(bins)-1:2], y[2:2*len(bins)-1:2] = m, m
+                y[1:2*len(bins)-1:2], y[2:2*len(bins):2] = m + bottom, m + bottom
                 if log:
                     y[y < minimum] = minimum
                 if orientation == 'horizontal':
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_step_bottom.png b/lib/matplotlib/tests/baseline_images/test_axes/hist_step_bottom.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1207,6 +1207,15 @@ def test_hist_stacked_normed():
     ax.hist((d1, d2), stacked=True, normed=True)
 
 
+@image_comparison(baseline_images=['hist_step_bottom'], extensions=['png'], remove_text=True)
+def test_hist_step_bottom():
+    # make some data
+    d1 = np.linspace(1, 3, 20)
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.hist(d1, bottom=np.arange(10), histtype="stepfilled")
+
+
 @image_comparison(baseline_images=['hist_stacked_bar'])
 def test_hist_stacked_bar():
     # make some data
diff --git a/setupext.py b/setupext.py
@@ -1353,8 +1353,12 @@ def hardcoded_tcl_config(self):
     def add_flags(self, ext):
         if sys.platform == 'win32':
             major, minor1, minor2, s, tmp = sys.version_info
-            ext.include_dirs.extend(['win32_static/include/tcl85'])
-            ext.libraries.extend(['tk85', 'tcl85'])
+            if sys.version_info[0:2] < (3, 4):
+                ext.include_dirs.extend(['win32_static/include/tcl85'])
+                ext.libraries.extend(['tk85', 'tcl85'])
+            else:
+                ext.include_dirs.extend(['win32_static/include/tcl86'])
+                ext.libraries.extend(['tk86t', 'tcl86t'])
             ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
 
         elif sys.platform == 'darwin':
