MNT: revert changes to tick kwarg behavior

tacaswell · tacaswell · commit cc301b7441c1 · 2016-01-03T16:31:26.000-05:00
diff --git a/doc/api/api_changes/2016-01-03_colorbar.rst b/doc/api/api_changes/2016-01-03_colorbar.rst
@@ -9,4 +9,4 @@ input.
 
 If ``mappable`` is a `contour.ContourSet` then a `TypeError` will be raised
 if the user provides any of
-``('alpha', 'boundaries', 'values', 'extend', 'ticks', 'filled')``
+``('alpha', 'boundaries', 'values', 'extend', 'filled')``
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -887,14 +887,14 @@ def __init__(self, ax, mappable, **kw):
         if isinstance(mappable, contour.ContourSet):
             CS = mappable
             override_list = ('alpha', 'boundaries', 'values', 'extend',
-                             'ticks', 'filled')
+                             'filled')
             kw = cbook.normalize_kwargs(kw, forbidden=override_list)
             kw['alpha'] = mappable.get_alpha()
-            kw['ticks'] = ticker.FixedLocator(CS.levels, nbins=10)
             kw['boundaries'] = CS._levels
             kw['values'] = CS.cvalues
             kw['extend'] = CS.extend
             kw['filled'] = CS.filled
+            kw.setdefault('ticks', ticker.FixedLocator(CS.levels, nbins=10))
             ColorbarBase.__init__(self, ax, **kw)
             if not CS.filled:
                 self.add_lines(CS)
