Merge pull request #9928 from timhoffm/cleanup-delaxes

efiring · web-flow · commit 2f282868c8cc · 2017-12-04T17:07:45.000-10:00
Cleanup delaxes()
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -864,9 +864,11 @@ def set_frameon(self, b):
         self.frameon = b
         self.stale = True
 
-    def delaxes(self, a):
-        'remove a from the figure and update the current axes'
-        self._axstack.remove(a)
+    def delaxes(self, ax):
+        """
+        Remove the `~.Axes` *ax* from the figure and update the current axes.
+        """
+        self._axstack.remove(ax)
         for func in self._axobservers:
             func(self)
         self.stale = True
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -919,19 +919,14 @@ def axes(*args, **kwargs):
     return a
 
 
-def delaxes(*args):
+def delaxes(ax=None):
     """
-    Remove an axes from the current figure.  If *ax*
-    doesn't exist, an error will be raised.
-
-    ``delaxes()``: delete the current axes
+    Remove the given `Axes` *ax* from the current figure. If *ax* is *None*,
+    the current axes is removed. A KeyError is raised if the axes doesn't exist.
     """
-    if not len(args):
+    if ax is None:
         ax = gca()
-    else:
-        ax = args[0]
-    ret = gcf().delaxes(ax)
-    return ret
+    gcf().delaxes(ax)
 
 
 def sca(ax):
