Fix fig.format/grid.format issues with basemap projections

lukelbd · lukelbd · commit 018d15a27500 · 2021-10-16T17:57:42.000-06:00
diff --git a/proplot/axes/base.py b/proplot/axes/base.py
@@ -706,8 +706,8 @@ def __init__(self, *args, **kwargs):
         kw_format = _pop_props(kwargs, 'patch')  # background properties
         if 'zorder' in kw_format:  # special case: refers to the entire axes
             kwargs['zorder'] = kw_format.pop('zorder')
-        for name in {None, self._name}:  # base method and class method (if it exists)
-            kw_format.update(_pop_params(kwargs, self._format_signatures.get(name)))
+        for cls in {Axes, type(self)}:
+            kw_format.update(_pop_params(kwargs, self._format_signatures.get(cls)))
         super().__init__(*args, **kwargs)
 
         # Varous scalar properties
@@ -3048,5 +3048,5 @@ def number(self, num):
 
 # Apply signature obfuscation after storing previous signature
 # NOTE: This is needed for __init__
-Axes._format_signatures = {None: inspect.signature(Axes.format)}
+Axes._format_signatures = {Axes: inspect.signature(Axes.format)}
 Axes.format = docstring._obfuscate_kwargs(Axes.format)
diff --git a/proplot/axes/cartesian.py b/proplot/axes/cartesian.py
@@ -1219,7 +1219,7 @@ def _parse_alt(self, x, **kwargs):
         """
         Optionally omit the leading x or y from "twin axes" methods.
         """
-        sig = self._format_signatures[self._name]
+        sig = self._format_signatures[type(self)]
         keys = tuple(key[1:] for key in sig.parameters if key[0] == x)
         kwargs = {(x + key if key in keys else key): val for key, val in kwargs.items()}
         for axis in 'xy':  # standardize format() location aliases
@@ -1351,5 +1351,5 @@ def get_tightbbox(self, renderer, *args, **kwargs):
 
 # Apply signature obfuscation after storing previous signature
 # NOTE: This is needed for __init__, altx, and alty
-CartesianAxes._format_signatures[CartesianAxes._name] = inspect.signature(CartesianAxes.format)  # noqa: E501
+CartesianAxes._format_signatures[CartesianAxes] = inspect.signature(CartesianAxes.format)  # noqa: E501
 CartesianAxes.format = docstring._obfuscate_kwargs(CartesianAxes.format)
diff --git a/proplot/axes/geo.py b/proplot/axes/geo.py
@@ -1418,6 +1418,5 @@ def _update_minor_gridlines(self, longrid=None, latgrid=None, nsteps=None):
 
 
 # Apply signature obfuscation after storing previous signature
-GeoAxes._format_signatures[_CartopyAxes._name] = inspect.signature(GeoAxes.format)
-GeoAxes._format_signatures[_BasemapAxes._name] = inspect.signature(GeoAxes.format)
+GeoAxes._format_signatures[GeoAxes] = inspect.signature(GeoAxes.format)
 GeoAxes.format = docstring._obfuscate_kwargs(GeoAxes.format)
diff --git a/proplot/axes/polar.py b/proplot/axes/polar.py
@@ -335,5 +335,5 @@ def format(
 
 # Apply signature obfuscation after storing previous signature
 # NOTE: This is needed for __init__
-PolarAxes._format_signatures[PolarAxes._name] = inspect.signature(PolarAxes.format)
+PolarAxes._format_signatures[PolarAxes] = inspect.signature(PolarAxes.format)
 PolarAxes.format = docstring._obfuscate_kwargs(PolarAxes.format)
diff --git a/proplot/figure.py b/proplot/figure.py
@@ -1542,26 +1542,27 @@ def format(
         # Update the main axes
         if skip_axes:  # avoid recursion
             return
-        names = set()  # track used dictionaries
-        dicts = {
-            name: _pop_params(kwargs, sig)
-            for name, sig in paxes.Axes._format_signatures.items()
+        kws = {
+            cls: _pop_params(kwargs, sig)
+            for cls, sig in paxes.Axes._format_signatures.items()
         }
+        classes = set()  # track used dictionaries
         for ax in axs:
-            dict_ = {}
-            for name in {None, ax._name}:
-                names.add(name)
-                dict_.update(dicts.get(name, {}))
-            ax.format(rc_kw=rc_kw, rc_mode=rc_mode, skip_figure=True, **dict_, **kwargs)
+            kw = {
+                key: value for cls, kw in kws.items()
+                for key, value in kw.items()
+                if isinstance(ax, cls) and not classes.add(cls)
+            }
+            ax.format(rc_kw=rc_kw, rc_mode=rc_mode, skip_figure=True, **kw, **kwargs)
 
         # Warn unused keyword argument(s)
-        other = {
-            key: value for name in dicts.keys() - names
-            for key, value in dicts[name].items()
+        kw = {
+            key: value for name in kws.keys() - classes
+            for key, value in kws[name].items()
         }
-        if other:
+        if kw:
             warnings._warn_proplot(
-                f'Ignoring unused projection-specific format() keyword argument(s): {other}'  # noqa: E501
+                f'Ignoring unused projection-specific format() keyword argument(s): {kw}'  # noqa: E501
             )
 
     @docstring._concatenate_inherited
