Prefer closing brackets on new lines

proplot-dev · lukelbd · Jan 7, 2020 · Dec 19, 2019 · Jan 6, 2020 · Jan 6, 2020
commit c57c7b0c076818d30af16dfaef0bd074bdb62d1b
diff --git a/proplot/axes.py b/proplot/axes.py
diff --git a/proplot/axistools.py b/proplot/axistools.py
@@ -127,7 +127,8 @@ def Locator(locator, *args, **kwargs):
         if locator not in locators:
             raise ValueError(
                 f'Unknown locator {locator!r}. Options are '
-                + ', '.join(map(repr, locators.keys())) + '.')
+                + ', '.join(map(repr, locators.keys())) + '.'
+            )
         locator = locators[locator](*args, **kwargs)
     elif isinstance(locator, Number):  # scalar variable
         locator = mticker.MultipleLocator(locator, *args, **kwargs)
@@ -266,7 +267,8 @@ def Formatter(formatter, *args, date=False, index=False, **kwargs):
             if formatter not in formatters:
                 raise ValueError(
                     f'Unknown formatter {formatter!r}. Options are '
-                    + ', '.join(map(repr, formatters.keys())) + '.')
+                    + ', '.join(map(repr, formatters.keys())) + '.'
+                )
             formatter = formatters[formatter](*args, **kwargs)
     elif callable(formatter):
         formatter = mticker.FuncFormatter(formatter, *args, **kwargs)
@@ -348,7 +350,8 @@ def Scale(scale, *args, **kwargs):
         if args or kwargs:
             _warn_proplot(
                 f'Scale {scale!r} is a scale *preset*. Ignoring positional '
-                'argument(s): {args} and keyword argument(s): {kwargs}. ')
+                'argument(s): {args} and keyword argument(s): {kwargs}. '
+            )
         scale, *args = SCALE_PRESETS[scale]
     # Get scale
     scale = scale.lower()
@@ -357,7 +360,8 @@ def Scale(scale, *args, **kwargs):
     else:
         raise ValueError(
             f'Unknown scale or preset {scale!r}. Options are '
-            + ', '.join(map(repr, list(scales) + list(SCALE_PRESETS))) + '.')
+            + ', '.join(map(repr, list(scales) + list(SCALE_PRESETS))) + '.'
+        )
     return scale(*args, **kwargs)
 
 
@@ -382,9 +386,11 @@ class AutoFormatter(mticker.ScalarFormatter):
     3. Allows user to add arbitrary prefix or suffix to every
        tick label string.
     """
-    def __init__(self, *args,
-                 zerotrim=None, precision=None, tickrange=None,
-                 prefix=None, suffix=None, negpos=None, **kwargs):
+    def __init__(
+        self, *args,
+        zerotrim=None, precision=None, tickrange=None,
+        prefix=None, suffix=None, negpos=None, **kwargs
+    ):
         """
         Parameters
         ----------
@@ -543,7 +549,8 @@ def _scale_factory(scale, axis, *args, **kwargs):
         if scale not in scales:
             raise ValueError(
                 f'Unknown scale {scale!r}. Options are '
-                + ', '.join(map(repr, scales.keys())) + '.')
+                + ', '.join(map(repr, scales.keys())) + '.'
+            )
         return scales[scale](*args, **kwargs)
 
 
@@ -761,11 +768,12 @@ class FuncScale(_ScaleBase, mscale.ScaleBase):
     name = 'function'
     """The registered scale name."""
 
-    def __init__(self, arg, invert=False, parent_scale=None,
-                 major_locator=None, minor_locator=None,
-                 major_formatter=None, minor_formatter=None,
-                 smart_bounds=None,
-                 ):
+    def __init__(
+        self, arg, invert=False, parent_scale=None,
+        major_locator=None, minor_locator=None,
+        major_formatter=None, minor_formatter=None,
+        smart_bounds=None,
+    ):
         """
         Parameters
         ----------
@@ -1014,8 +1022,8 @@ class ExpScale(_ScaleBase, mscale.ScaleBase):
     """The registered scale name."""
 
     def __init__(
-            self, a=np.e, b=1, c=1, inverse=False, minpos=1e-300,
-            **kwargs):
+        self, a=np.e, b=1, c=1, inverse=False, minpos=1e-300, **kwargs
+    ):
         """
         Parameters
         ----------
@@ -1320,7 +1328,8 @@ def __init__(self, threshs, scales, zero_dists=None):
                 any((dists == 0) != (scales == 0)) or zero_dists is None):
             raise ValueError(
                 'Got zero scales and distances in different places or '
-                'zero_dists is None.')
+                'zero_dists is None.'
+            )
         self._scales = scales
         self._threshs = threshs
         with np.errstate(divide='ignore', invalid='ignore'):

diff --git a/proplot/projs.py b/proplot/projs.py
@@ -171,11 +171,13 @@ def Proj(name, basemap=False, **kwargs):
         if 'boundinglat' in kwargs:
             raise ValueError(
                 f'"boundinglat" must be passed to the ax.format() command '
-                'for cartopy axes.')
+                'for cartopy axes.'
+            )
         if crs is None:
             raise ValueError(
                 f'Unknown projection {name!r}. Options are: '
-                + ', '.join(map(repr, cartopy_names.keys())))
+                + ', '.join(map(repr, cartopy_names.keys()))
+            )
         proj = crs(**kwargs)
         aspect = (np.diff(proj.x_limits) / np.diff(proj.y_limits))[0]
     return proj, aspect
@@ -197,8 +199,10 @@ def __init__(self, central_longitude=0, globe=None,
         a = globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS
         b = globe.semiminor_axis or a
         if b != a or globe.ellipse is not None:
-            _warn_proplot(f'The {self.name!r} projection does not handle '
-                          'elliptical globes.')
+            _warn_proplot(
+                f'The {self.name!r} projection does not handle '
+                'elliptical globes.'
+            )
 
         proj4_params = {'proj': 'hammer', 'lon_0': central_longitude}
         super().__init__(proj4_params, central_longitude,
@@ -230,8 +234,10 @@ def __init__(self, central_longitude=0, globe=None,
         a = globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS
         b = globe.semiminor_axis or a
         if b != a or globe.ellipse is not None:
-            _warn_proplot(f'The {self.name!r} projection does not handle '
-                          'elliptical globes.')
+            _warn_proplot(
+                f'The {self.name!r} projection does not handle '
+                'elliptical globes.'
+            )
 
         proj4_params = {'proj': 'aitoff', 'lon_0': central_longitude}
         super().__init__(proj4_params, central_longitude,
@@ -263,8 +269,10 @@ def __init__(self, central_longitude=0, globe=None,
         a = globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS
         b = globe.semiminor_axis or a
         if b != a or globe.ellipse is not None:
-            _warn_proplot(f'The {self.name!r} projection does not handle '
-                          'elliptical globes.')
+            _warn_proplot(
+                f'The {self.name!r} projection does not handle '
+                'elliptical globes.'
+            )
 
         proj4_params = {'proj': 'kav7', 'lon_0': central_longitude}
         super().__init__(proj4_params, central_longitude,
@@ -296,8 +304,10 @@ def __init__(self, central_longitude=0, globe=None,
         a = globe.semimajor_axis or WGS84_SEMIMAJOR_AXIS
         b = globe.semiminor_axis or a
         if b != a or globe.ellipse is not None:
-            _warn_proplot(f'The {self.name!r} projection does not handle '
-                          'elliptical globes.')
+            _warn_proplot(
+                f'The {self.name!r} projection does not handle '
+                'elliptical globes.'
+            )
 
         proj4_params = {'proj': 'wintri', 'lon_0': central_longitude}
         super().__init__(proj4_params, central_longitude,
@@ -473,4 +483,5 @@ def __init__(self, central_longitude=0.0, globe=None):
     if _unavail:
         _warn_proplot(
             f'Cartopy projection(s) {", ".join(map(repr, _unavail))} are '
-            f'unavailable. Consider updating to cartopy >= 0.17.0.')
+            f'unavailable. Consider updating to cartopy >= 0.17.0.'
+        )
diff --git a/proplot/rctools.py b/proplot/rctools.py
@@ -448,14 +448,9 @@ def _tabulate(rcdict):
     'rivers.linewidth',
     'subplots.axpad',
     'subplots.axwidth',
-    'subplots.innerspace',
     'subplots.pad',
     'subplots.panelpad',
-    'subplots.panelspace',
     'subplots.panelwidth',
-    'subplots.titlespace',
-    'subplots.xlabspace',
-    'subplots.ylabspace',
     'suptitle.color',
     'suptitle.size',
     'suptitle.weight',
@@ -551,7 +546,8 @@ def _get_synced_params(key, value):
                     mcolors.ListedColormap))
             raise ValueError(
                 f'Invalid cycle name {cycle!r}. Options are: '
-                ', '.join(map(repr, cycles)) + '.')
+                ', '.join(map(repr, cycles)) + '.'
+            )
         if rgbcycle and cycle.lower() == 'colorblind':
             regcolors = colors + [(0.1, 0.1, 0.1)]
         elif mcolors.to_rgb('r') != (1.0, 0.0, 0.0):  # reset
@@ -751,7 +747,8 @@ def __enter__(self):
         """Apply settings from the most recent context block."""
         if not self._context:
             raise RuntimeError(
-                f'rc context must be initialized with rc.context().')
+                f'rc object must be initialized with rc.context().'
+            )
         *_, kwargs, cache, restore = self._context[-1]
 
         def _update(rcdict, newdict):
@@ -768,7 +765,8 @@ def __exit__(self, *args):
         """Restore settings from the most recent context block."""
         if not self._context:
             raise RuntimeError(
-                f'rc context must be initialized with rc.context().')
+                f'rc object must be initialized with rc.context().'
+            )
         *_, restore = self._context[-1]
         for key, value in restore.items():
             rc_short, rc_long, rc = _get_synced_params(key, value)
@@ -990,10 +988,7 @@ def fill(self, props, *, context=False):
         Parameters
         ----------
         props : dict-like
-            Dictionary whose values are names of settings. The values
-            are replaced with the corresponding property only if
-            `~rc_configurator.__getitem__` does not return ``None``. Otherwise,
-            that key, value pair is omitted from the output dictionary.
+            Dictionary whose values are `rc` setting names.
         context : bool, optional
             If ``True``, then each setting that is not found in the
             context mode dictionaries is omitted from the output dictionary.
@@ -1152,7 +1147,8 @@ def ipython_matplotlib(backend=None, fmt=None):
     else:
         raise ValueError(
             f'Invalid inline backend format {fmt!r}. '
-            'Must be string or list thereof.')
+            'Must be string or list thereof.'
+        )
     ipython.magic(f'config InlineBackend.figure_formats = {fmt!r}')
     ipython.magic('config InlineBackend.rc = {}')  # no notebook overrides
     ipython.magic('config InlineBackend.close_figures = True')  # memory issues