api vs cbook

jklymak · jklymak · commit eb3715bed3a8 · 2021-02-19T20:44:30.000-08:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -35,7 +35,7 @@
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _api, cbook, collections, cm, colors, contour, ticker
+from matplotlib import _api, collections, cm, colors, contour, ticker
 from matplotlib.axes._base import _TransformedBoundsLocator
 from matplotlib.axes._axes import Axes
 import matplotlib.artist as martist
@@ -370,7 +370,11 @@ class ColorbarBase:
 
     n_rasterize = 50  # rasterize solids if number of colors >= n_rasterize
 
+<<<<<<< HEAD
     @_api.make_keyword_only("3.3", "cmap")
+=======
+    @_api._make_keyword_only("3.3", "cmap")
+>>>>>>> api vs cbook
     def __init__(self, ax, cmap=None,
                  norm=None,
                  alpha=None,
@@ -388,7 +392,11 @@ def __init__(self, ax, cmap=None,
                  extendrect=False,
                  label='',
                  ):
+<<<<<<< HEAD
         _api.check_isinstance([colors.Colormap, None], cmap=cmap)
+=======
+        _api._check_isinstance([colors.Colormap, None], cmap=cmap)
+>>>>>>> api vs cbook
         _api.check_in_list(
             ['vertical', 'horizontal'], orientation=orientation)
         _api.check_in_list(
@@ -792,7 +800,7 @@ def set_ticklabels(self, ticklabels, update_ticks=True):
         if isinstance(self.locator, ticker.FixedLocator):
             self.formatter = ticker.FixedFormatter(ticklabels)
         else:
-            cbook._warn_external("set_ticks() must have been called.")
+            _api._warn_external("set_ticks() must have been called.")
         self.stale = True
 
     def minorticks_on(self):
