Merge branch 'v1.5.x' into v2.x

tacaswell · tacaswell · commit d2f4d30177ce · 2015-12-20T17:01:31.000-05:00
diff --git a/doc/make.py b/doc/make.py
@@ -165,7 +165,7 @@ def all():
             os.unlink(link)
         else:
             raise RuntimeError("doc/{0} should be a directory or symlink -- it"
-                               " isn't")
+                               " isn't".format(link))
     if not os.path.exists(link):
         if hasattr(os, 'symlink'):
             os.symlink(target, link)
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -580,7 +580,7 @@ def _ticker(self):
             else:
                 b = self._boundaries[self._inside]
                 locator = ticker.FixedLocator(b, nbins=10)
-        if isinstance(self.norm, colors.NoNorm):
+        if isinstance(self.norm, colors.NoNorm) and self.boundaries is None:
             intv = self._values[0], self._values[-1]
         else:
             intv = self.vmin, self.vmax
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -707,7 +707,7 @@ def __call__(self, x, pos=None):
         elif six.callable(fmt):
             result = fmt(x, pos)
         else:
-            raise TypeError('Unexpected type passed to {!r}.'.formatter(self))
+            raise TypeError('Unexpected type passed to {0!r}.'.format(self))
 
         return result
 
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -282,6 +282,22 @@ def test_colorbar_closed_patch():
                      extend='neither', values=values)
 
 
+@cleanup
+def test_colorbar_ticks():
+    # test fix for #5673
+    fig, ax = plt.subplots()
+    x = np.arange(-3.0, 4.001)
+    y = np.arange(-4.0, 3.001)
+    X, Y = np.meshgrid(x, y)
+    Z = X * Y
+    clevs = np.array([-12, -5, 0, 5, 12], dtype=float)
+    colors = ['r', 'g', 'b', 'c']
+    cs = ax.contourf(X, Y, Z, clevs, colors=colors)
+    cbar = fig.colorbar(cs, ax=ax, extend='neither',
+                        orientation='horizontal', ticks=clevs)
+    assert len(cbar.ax.xaxis.get_ticklocs()) == len(clevs)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
