Merge branch 'master' into wrapper-docs-on-methods

proplot/axes.py

@@ -7,7 +7,7 @@
 import inspect
 import functools
 from matplotlib import docstring
-from numbers import Integral
+from numbers import Integral, Number
 import matplotlib.projections as mproj
 import matplotlib.axes as maxes
 import matplotlib.dates as mdates
@@ -78,40 +78,6 @@
     'uc': 'upper center',
     'lc': 'lower center',
 }
-SIDE_TRANSLATE = {
-    'l': 'left',
-    'r': 'right',
-    'b': 'bottom',
-    't': 'top',
-}
-LOC_TRANSLATE = {
-    None: None,
-    'inset': 'best',
-    'i': 'best',
-    0: 'best',
-    1: 'upper right',
-    2: 'upper left',
-    3: 'lower left',
-    4: 'lower right',
-    5: 'center left',
-    6: 'center right',
-    7: 'lower center',
-    8: 'upper center',
-    9: 'center',
-    'l': 'left',
-    'r': 'right',
-    'b': 'bottom',
-    't': 'top',
-    'c': 'center',
-    'ur': 'upper right',
-    'ul': 'upper left',
-    'll': 'lower left',
-    'lr': 'lower right',
-    'cr': 'center right',
-    'cl': 'center left',
-    'uc': 'upper center',
-    'lc': 'lower center',
-}
 
 
 def _get_transform(self, transform):
@@ -1064,17 +1030,18 @@ def boxes(self, *args, **kwargs):
     @_concatenate_docstrings
     @docstring.dedent_interpd
     def boxplot(
-            self, *args,
-            color='k', fill=True, fillcolor=None, fillalpha=0.7,
-            lw=None, linewidth=0.7, orientation=None,
-            marker=None, markersize=None,
-            boxcolor=None, boxlw=None,
-            capcolor=None, caplw=None,
-            meancolor=None, meanlw=None,
-            mediancolor=None, medianlw=None,
-            whiskercolor=None, whiskerlw=None,
-            fliercolor=None, flierlw=None,
-            **kwargs):
+        self, *args,
+        color='k', fill=True, fillcolor=None, fillalpha=0.7,
+        lw=None, linewidth=0.7, orientation=None,
+        marker=None, markersize=None,
+        boxcolor=None, boxlw=None,
+        capcolor=None, caplw=None,
+        meancolor=None, meanlw=None,
+        mediancolor=None, medianlw=None,
+        whiskercolor=None, whiskerlw=None,
+        fliercolor=None, flierlw=None,
+        **kwargs
+    ):
         """
         Adds convenient keyword args. Fills the objects with a cycle color
         by default.
@@ -1170,10 +1137,12 @@ def boxplot(
         return obj
 
     @docstring.dedent_interpd
-    def colorbar(self, *args, loc=None, pad=None,
-                 length=None, width=None, space=None, frame=None, frameon=None,
-                 alpha=None, linewidth=None, edgecolor=None, facecolor=None,
-                 **kwargs):
+    def colorbar(
+        self, *args, loc=None, pad=None,
+        length=None, width=None, space=None, frame=None, frameon=None,
+        alpha=None, linewidth=None, edgecolor=None, facecolor=None,
+        **kwargs
+    ):
         """
         Adds colorbar as an *inset* or along the outside edge of the axes.
 
@@ -1547,8 +1516,10 @@ def hist(self, x, bins=None, **kwargs):
         ))
         return hist(self, x, bins=bins, **kwargs)
 
-    def inset_axes(self, bounds, *, transform=None, zorder=5,
-                   zoom=True, zoom_kw=None, **kwargs):
+    def inset_axes(
+        self, bounds, *, transform=None, zorder=5,
+        zoom=True, zoom_kw=None, **kwargs
+    ):
         """
         Like the builtin `~matplotlib.axes.Axes.inset_axes` method, but
         draws an inset `XYAxes` axes and adds some options.
@@ -3706,7 +3677,8 @@ def format(
                `~mpl_toolkits.basemap.Basemap.drawmeridians` and
                `~mpl_toolkits.basemap.Basemap.drawparallels` methods.
 
-        land, ocean, coast, rivers, lakes, borders, innerborders : bool, optional
+        land, ocean, coast, rivers, lakes, borders, innerborders : bool, \
+optional
             Toggles various geographic features. These are actually the
             :rcraw:`land`, :rcraw:`ocean`, :rcraw:`coast`, :rcraw:`rivers`,
             :rcraw:`lakes`, :rcraw:`borders`, and :rcraw:`innerborders`
@@ -3729,11 +3701,11 @@ def format(
         See also
         --------
         :py:obj:`Axes.format`, :py:obj:`Axes.context`
-        """  # noqa
-        # Parse alternative keyword args
-        # TODO: Why isn't default latmax 80 respected sometimes?
-        context, kwargs = self.context(**kwargs)
-        with context:
+        """
+        rc_kw, rc_mode, kwargs = _parse_format(**kwargs)
+        with rc.context(rc_kw, mode=rc_mode):
+            # Parse alternative keyword args
+            # TODO: Why isn't default latmax 80 respected sometimes?
             lonlines = _notNone(
                 lonlines, lonlocator, rc.get('geogrid.lonstep', context=True),
                 names=('lonlines', 'lonlocator')

proplot/subplots.py

@@ -1898,22 +1898,23 @@ def _axes_dict(naxs, value, kw=False, default=None):
 
 @docstring.dedent_interpd
 def subplots(
-        array=None, ncols=1, nrows=1,
-        ref=1, order='C',
-        aspect=1, figsize=None,
-        width=None, height=None, axwidth=None, axheight=None, journal=None,
-        hspace=None, wspace=None, space=None,
-        hratios=None, wratios=None,
-        width_ratios=None, height_ratios=None,
-        flush=None, wflush=None, hflush=None,
-        left=None, bottom=None, right=None, top=None,
-        tight=None, pad=None, axpad=None, panelpad=None,
-        span=None, spanx=None, spany=None,
-        align=None, alignx=None, aligny=None,
-        share=None, sharex=None, sharey=None,
-        basemap=False, proj=None, projection=None,
-        proj_kw=None, projection_kw=None,
-        autoformat=True, includepanels=False):
+    array=None, ncols=1, nrows=1,
+    ref=1, order='C',
+    aspect=1, figsize=None,
+    width=None, height=None, journal=None,
+    axwidth=None, axheight=None,
+    hspace=None, wspace=None, space=None,
+    hratios=None, wratios=None,
+    width_ratios=None, height_ratios=None,
+    flush=None, wflush=None, hflush=None,
+    left=None, bottom=None, right=None, top=None,
+    span=None, spanx=None, spany=None,
+    align=None, alignx=None, aligny=None,
+    share=None, sharex=None, sharey=None,
+    basemap=False, proj=None, projection=None,
+    proj_kw=None, projection_kw=None,
+    **kwargs
+):
     """
     Analogous to `matplotlib.pyplot.subplots`, creates a figure with a single
     axes or arbitrary grids of axes, any of which can be map projections.

proplot/wrappers.py

@@ -695,17 +695,17 @@ def _errorbar_values(data, idata, bardata=None, barrange=None, barstd=False):
 
 
 def add_errorbars(
-        self, func, *args,
-        medians=False, means=False,
-        boxes=None, bars=None,
-        boxdata=None, bardata=None,
-        boxstd=False, barstd=False,
-        boxmarker=True, boxmarkercolor='white',
-        boxrange=(25, 75), barrange=(5, 95), boxcolor=None, barcolor=None,
-        boxlw=None, barlw=None, capsize=None,
-        boxzorder=3, barzorder=3,
-        **kwargs):
-    # Function
+    self, func, *args,
+    medians=False, means=False,
+    boxes=None, bars=None,
+    boxdata=None, bardata=None,
+    boxstd=False, barstd=False,
+    boxmarker=True, boxmarkercolor='white',
+    boxrange=(25, 75), barrange=(5, 95), boxcolor=None, barcolor=None,
+    boxlw=None, barlw=None, capsize=None,
+    boxzorder=3, barzorder=3,
+    **kwargs
+):
     name = func.__name__
     x, y, *args = args
     # Sensible defaults
@@ -1122,16 +1122,17 @@ def cycle_changer(self, func, *args,
 
 
 def cmap_changer(
-        self, func, *args, cmap=None, cmap_kw=None,
-        extend='neither', norm=None, norm_kw=None,
-        N=None, levels=None, values=None, centers=None, vmin=None, vmax=None,
-        locator=None, symmetric=False, locator_kw=None,
-        edgefix=None, labels=False, labels_kw=None, fmt=None, precision=2,
-        colorbar=False, colorbar_kw=None, panel_kw=None,
-        lw=None, linewidth=None, linewidths=None,
-        ls=None, linestyle=None, linestyles=None,
-        color=None, colors=None, edgecolor=None, edgecolors=None,
-        **kwargs):
+    self, func, *args, cmap=None, cmap_kw=None,
+    extend='neither', norm=None, norm_kw=None,
+    N=None, levels=None, values=None, centers=None, vmin=None, vmax=None,
+    locator=None, symmetric=False, locator_kw=None,
+    edgefix=None, labels=False, labels_kw=None, fmt=None, precision=2,
+    colorbar=False, colorbar_kw=None, panel_kw=None,
+    lw=None, linewidth=None, linewidths=None,
+    ls=None, linestyle=None, linestyles=None,
+    color=None, colors=None, edgecolor=None, edgecolors=None,
+    **kwargs
+):
     # Wraps methods that take a ``cmap`` argument (%(methods)s),
     # adds several new keyword args and features.
     # Uses the `~proplot.styletools.BinNorm` normalizer to bin data into