Merge Colorbar and ColorbarBase.

anntzer · anntzer · commit 6e76ae6a6d7e · 2021-06-03T16:11:19.000+02:00
ColorbarBase differs from Colorbar in that it is not associated with a
ScalarMappable (but constructed from explicit cmap/norm), but we already
document in Figure.colorbar that the preferred way to draw colorbars not
associated with an existing artist is to create an empty ScalarMappable
to provide `norm` and `cmap`.

Hence, likewise merge Colorbar and ColorbarBase (creating the
ScalarMappable on-the-fly if no mappable is passed to the constructor),
which should make the APIs clearer.  (Note that we are already
discouraging users to directly call either class' constructors,
anyways).  We could deprecate the backcompat APIs (i.e., the
`ColorbarBase` alias, the `cmap` and `norm` kwargs, and the different
semantics of `add_lines`), but that can be done later; this PR should be
entirely backcompatible.
diff --git a/examples/color/colorbar_basics.py b/examples/color/colorbar_basics.py
@@ -54,5 +54,5 @@
 #
 #    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
 #    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
-#    - `matplotlib.colorbar.ColorbarBase.minorticks_on`
-#    - `matplotlib.colorbar.ColorbarBase.minorticks_off`
+#    - `matplotlib.colorbar.Colorbar.minorticks_on`
+#    - `matplotlib.colorbar.Colorbar.minorticks_off`
diff --git a/examples/images_contours_and_fields/image_masked.py b/examples/images_contours_and_fields/image_masked.py
@@ -79,4 +79,4 @@
 #    - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
 #    - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
 #    - `matplotlib.colors.BoundaryNorm`
-#    - `matplotlib.colorbar.ColorbarBase.set_label`
+#    - `matplotlib.colorbar.Colorbar.set_label`
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py

Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,5 @@`
`54`	`54`	`#`
`55`	`55`	# - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow`
`56`	`56`	# - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar`
`57`		-# - `matplotlib.colorbar.ColorbarBase.minorticks_on`
`58`		-# - `matplotlib.colorbar.ColorbarBase.minorticks_off`
	`57`	+# - `matplotlib.colorbar.Colorbar.minorticks_on`
	`58`	+# - `matplotlib.colorbar.Colorbar.minorticks_off`