Also warn in pyplot.colorbar (by falling back to Figure.colorbar).

anntzer · anntzer · commit 738d7dfd76ef · 2020-07-06T09:50:45.000+02:00
diff --git a/doc/api/next_api_changes/deprecations/12443-AL.rst b/doc/api/next_api_changes/deprecations/12443-AL.rst
@@ -1,8 +1,8 @@
-Figure.colorbar now warns when the mappable's axes is different from the current axes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``colorbar`` now warns when the mappable's axes is different from the current axes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Currently, `.Figure.colorbar` steals space by default from the current axes
-to place the colorbar.  In a future version, it will steal space from the
-mappable's axes instead.  In preparation for this change, `.Figure.colorbar`
-now emits a warning when the current axes is not the same as the mappable's
-axes.
+Currently, `.Figure.colorbar` and `.pyplot.colorbar` steal space by default
+from the current axes to place the colorbar.  In a future version, they will
+steal space from the mappable's axes instead.  In preparation for this change,
+`.Figure.colorbar` and `.pyplot.colorbar` now emits a warning when the current
+axes is not the same as the mappable's axes.
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2181,8 +2181,6 @@ def colorbar(mappable=None, cax=None, ax=None, **kw):
                                'creation. First define a mappable such as '
                                'an image (with imshow) or a contour set ('
                                'with contourf).')
-    if ax is None:
-        ax = gca()
     ret = gcf().colorbar(mappable, cax=cax, ax=ax, **kw)
     return ret
 
