@@ -370,11 +370,7 @@ class ColorbarBase:
370370
371371 n_rasterize = 50 # rasterize solids if number of colors >= n_rasterize
372372
373- < << << << HEAD
374373 @_api .make_keyword_only ("3.3" , "cmap" )
375- == == == =
376- @_api ._make_keyword_only ("3.3" , "cmap" )
377- >> >> >> > api vs cbook
378374 def __init__ (self , ax , cmap = None ,
379375 norm = None ,
380376 alpha = None ,
@@ -392,11 +388,7 @@ def __init__(self, ax, cmap=None,
392388 extendrect = False ,
393389 label = '' ,
394390 ):
395- << << << < HEAD
396391 _api .check_isinstance ([colors .Colormap , None ], cmap = cmap )
397- == == == =
398- _api ._check_isinstance ([colors .Colormap , None ], cmap = cmap )
399- >> >> >> > api vs cbook
400392 _api .check_in_list (
401393 ['vertical' , 'horizontal' ], orientation = orientation )
402394 _api .check_in_list (
@@ -763,7 +755,7 @@ def _get_ticker_locator_formatter(self):
763755 self .minorlocator = minorlocator
764756 _log .debug ('locator: %r' , locator )
765757
766- @_api ._delete_parameter ("3.5" , "update_ticks" )
758+ @_api .delete_parameter ("3.5" , "update_ticks" )
767759 def set_ticks (self , ticks , update_ticks = True ):
768760 """
769761 Set tick locations.
@@ -790,7 +782,7 @@ def get_ticks(self, minor=False):
790782 """Return the x ticks as a list of locations."""
791783 return self ._long_axis ().get_majorticklocs ()
792784
793- @_api ._delete_parameter ("3.5" , "update_ticks" )
785+ @_api .delete_parameter ("3.5" , "update_ticks" )
794786 def set_ticklabels (self , ticklabels , update_ticks = True ):
795787 """
796788 Set tick labels.
0 commit comments