REBASE

jklymak · jklymak · commit 835175b16715 · 2020-09-29T22:02:12.000-07:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -553,60 +553,6 @@ def add_axes(self, *args, **kwargs):
 
         Call signatures::
 
-<<<<<<< HEAD
-        key = fixlist(args), fixitems(kwargs.items())
-        return key
-
-    def _process_projection_requirements(
-            self, *args, axes_class=None, polar=False, projection=None,
-            **kwargs):
-        """
-        Handle the args/kwargs to add_axes/add_subplot/gca, returning::
-
-            (axes_proj_class, proj_class_kwargs, proj_stack_key)
-
-        which can be used for new axes initialization/identification.
-        """
-        if axes_class is not None:
-            if polar or projection is not None:
-                raise ValueError(
-                    "Cannot combine 'axes_class' and 'projection' or 'polar'")
-            projection_class = axes_class
-        else:
-
-            if polar:
-                if projection is not None and projection != 'polar':
-                    raise ValueError(
-                        "polar=True, yet projection=%r. "
-                        "Only one of these arguments should be supplied." %
-                        projection)
-                projection = 'polar'
-
-            if isinstance(projection, str) or projection is None:
-                projection_class = projections.get_projection_class(projection)
-            elif hasattr(projection, '_as_mpl_axes'):
-                projection_class, extra_kwargs = projection._as_mpl_axes()
-                kwargs.update(**extra_kwargs)
-            else:
-                raise TypeError(
-                    f"projection must be a string, None or implement a "
-                    f"_as_mpl_axes method, not {projection!r}")
-
-        # Make the key without projection kwargs, this is used as a unique
-        # lookup for axes instances
-        key = self._make_key(*args, **kwargs)
-
-        return projection_class, kwargs, key
-
-    @docstring.dedent_interpd
-    def add_axes(self, *args, **kwargs):
-        """
-        Add an axes to the figure.
-
-        Call signatures::
-
-=======
->>>>>>> Rebase
             add_axes(rect, projection=None, polar=False, **kwargs)
             add_axes(ax)
 
@@ -1639,30 +1585,39 @@ def _gci(self):
         return None
 
     def _process_projection_requirements(
-            self, *args, polar=False, projection=None, **kwargs):
+            self, *args, axes_class=None, polar=False, projection=None,
+            **kwargs):
         """
         Handle the args/kwargs to add_axes/add_subplot/gca, returning::
 
             (axes_proj_class, proj_class_kwargs, proj_stack_key)
 
         which can be used for new axes initialization/identification.
         """
-        if polar:
-            if projection is not None and projection != 'polar':
+        if axes_class is not None:
+            if polar or projection is not None:
                 raise ValueError(
-                    "polar=True, yet projection=%r. "
-                    "Only one of these arguments should be supplied." %
-                    projection)
-            projection = 'polar'
-
-        if isinstance(projection, str) or projection is None:
-            projection_class = projections.get_projection_class(projection)
-        elif hasattr(projection, '_as_mpl_axes'):
-            projection_class, extra_kwargs = projection._as_mpl_axes()
-            kwargs.update(**extra_kwargs)
+                    "Cannot combine 'axes_class' and 'projection' or 'polar'")
+            projection_class = axes_class
         else:
-            raise TypeError('projection must be a string, None or implement a '
-                            '_as_mpl_axes method. Got %r' % projection)
+
+            if polar:
+                if projection is not None and projection != 'polar':
+                    raise ValueError(
+                        "polar=True, yet projection=%r. "
+                        "Only one of these arguments should be supplied." %
+                        projection)
+                projection = 'polar'
+
+            if isinstance(projection, str) or projection is None:
+                projection_class = projections.get_projection_class(projection)
+            elif hasattr(projection, '_as_mpl_axes'):
+                projection_class, extra_kwargs = projection._as_mpl_axes()
+                kwargs.update(**extra_kwargs)
+            else:
+                raise TypeError(
+                    f"projection must be a string, None or implement a "
+                    f"_as_mpl_axes method, not {projection!r}")
 
         # Make the key without projection kwargs, this is used as a unique
         # lookup for axes instances
