FIX: rebase

jklymak · jklymak · commit 09cad29940af · 2021-02-19T21:39:53.000-08:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -370,11 +370,7 @@ 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,
@@ -392,11 +388,7 @@ 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(
@@ -763,7 +755,7 @@ def _get_ticker_locator_formatter(self):
         self.minorlocator = minorlocator
         _log.debug('locator: %r', locator)
 
-    @_api._delete_parameter("3.5", "update_ticks")
+    @_api.delete_parameter("3.5", "update_ticks")
     def set_ticks(self, ticks, update_ticks=True):
         """
         Set tick locations.
@@ -790,7 +782,7 @@ def get_ticks(self, minor=False):
         """Return the x ticks as a list of locations."""
         return self._long_axis().get_majorticklocs()
 
-    @_api._delete_parameter("3.5", "update_ticks")
+    @_api.delete_parameter("3.5", "update_ticks")
     def set_ticklabels(self, ticklabels, update_ticks=True):
         """
         Set tick labels.
diff --git a/lib/mpl_toolkits/tests/test_axes_grid.py b/lib/mpl_toolkits/tests/test_axes_grid.py
@@ -15,7 +15,6 @@ def test_imagegrid_cbar_mode_edge():
     # Remove this line when this test image is regenerated.
     plt.rcParams['pcolormesh.snap'] = False
 
-    mpl.rcParams["mpl_toolkits.legacy_colorbar"] = False
     X, Y = np.meshgrid(np.linspace(0, 6, 30), np.linspace(0, 6, 30))
     arr = np.sin(X) * np.cos(Y) + 1j*(np.sin(3*Y) * np.cos(Y/2.))
 
@@ -40,19 +39,9 @@ def test_imagegrid_cbar_mode_edge():
         ax3.imshow(np.abs(arr), cmap='jet')
         ax4.imshow(np.arctan2(arr.imag, arr.real), cmap='hsv')
 
-<<<<<<< HEAD
-        # In each row/column, the "first" colorbars must be overwritten by the
-        # "second" ones.  To achieve this, clear out the axes first.
-        for ax in grid:
-            ax.cax.cla()
-            cb = ax.cax.colorbar(
-                ax.images[0],
-                ticks=mpl.ticker.MaxNLocator(5))  # old default locator.
-=======
         for ax in grid:
             ax.cax.cla()
             cb = ax.cax.colorbar(ax.images[0])  # old default locator.
->>>>>>> ENH: Make colorbar axes more typical
 
 
 def test_imagegrid():
