Rebased and updated tests.

matplotlib · efiring · May 14, 2013 · Jun 15, 2012 · Jun 19, 2012 · Aug 13, 2012
commit da8827164b5d7664e0efb1fee8995769f5cfe32d
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -267,6 +267,7 @@ def __init__(self, ax, cmap=None,
                  filled=True,
                  extendfrac=None,
                  extendrect=False,
+                 label='',
                  ):
         self.ax = ax
         self._patch_ax()
@@ -352,7 +353,6 @@ def config_axis(self):
             ax.yaxis.set_ticks([])
             # location is either one of 'left' or 'right'
             ax.xaxis.set_label_position(self.ticklocation)
-            # XXX This wasn't enabled before...
             ax.xaxis.set_ticks_position(self.ticklocation)
 
         self._set_label()
@@ -1228,11 +1228,8 @@ def _add_solids(self, X, Y, C):
 
             patch = mpatches.PathPatch(mpath.Path(xy),
                                        facecolor=self.cmap(self.norm(val)),
-                                       hatch=hatch,
-                                       edgecolor='none', linewidth=0,
-                                       antialiased=False, **kw
-                                       )
-
+                                       hatch=hatch, linewidth=0,
+                                       antialiased=False, **kw)
             self.ax.add_patch(patch)
             patches.append(patch)
 
@@ -1247,12 +1244,9 @@ def _add_solids(self, X, Y, C):
             self.dividers = None
 
         if self.drawedges:
-            self.dividers = collections.LineCollection(
-                                    self._edges(X, Y),
-                                    colors=(mpl.rcParams['axes.edgecolor'],),
-                                    linewidths=(
-                                        0.5 * mpl.rcParams['axes.linewidth'],)
-                                    )
+            self.dividers = collections.LineCollection(self._edges(X, Y),
+                    colors=(mpl.rcParams['axes.edgecolor'],),
+                    linewidths=(0.5 * mpl.rcParams['axes.linewidth'],))
             self.ax.add_collection(self.dividers)
 
         self.ax.hold(_hold)

diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1418,7 +1418,7 @@ def savefig(self, *args, **kwargs):
                 ax.patch.set_edgecolor(cc[1])
 
     @docstring.dedent_interpd
-    def colorbar(self, mappable, cax=None, ax=None, use_gridspec=False, **kw):
+    def colorbar(self, mappable, cax=None, ax=None, use_gridspec=True, **kw):
         """
         Create a colorbar for a ScalarMappable instance, *mappable*.
 
@@ -1428,6 +1428,9 @@ def colorbar(self, mappable, cax=None, ax=None, use_gridspec=False, **kw):
         if ax is None:
             ax = self.gca()
 
+        # Store the value of gca so that we can set it back later on.
+        current_ax = self.gca()
+
         if cax is None:
             if use_gridspec and isinstance(ax, SubplotBase):
                 cax, kw = cbar.make_axes_gridspec(ax, **kw)
@@ -1436,7 +1439,7 @@ def colorbar(self, mappable, cax=None, ax=None, use_gridspec=False, **kw):
         cax.hold(True)
         cb = cbar.colorbar_factory(cax, mappable, **kw)
 
-        self.sca(ax)
+        self.sca(current_ax)
         return cb
 
     def subplots_adjust(self, *args, **kwargs):

diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -209,7 +209,6 @@ def rc_context(rc=None, fname=None):
     return matplotlib.rc_context(rc, fname)
 
 
-
 @docstring.copy_dedent(matplotlib.rcdefaults)
 def rcdefaults():
     matplotlib.rcdefaults()
@@ -303,8 +302,8 @@ def xkcd():
         raise
     return context
 
-## Figures ##
 
+## Figures ##
 
 def figure(num=None,  # autoincrement if None, else integer from 1-N
            figsize=None,  # defaults to rc figure.figsize

diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_locationing.pdf b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_locationing.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_locationing.png b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_locationing.png
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_sharing.pdf b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_sharing.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_sharing.png b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_sharing.png
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_orientation.pdf b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_orientation.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_orientation.png b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_orientation.png
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_subplots_adjust.pdf b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_subplots_adjust.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_subplots_adjust.png b/lib/matplotlib/tests/baseline_images/test_colorbar/cbar_with_subplots_adjust.png