Address new flake8 errors

Author: lukelbd

docs/1dplots.py

@@ -446,7 +446,7 @@
     xlim=(-1, 1), ylim=(-1, 1), title='Step gradations',
     xlabel='cosine angle', ylabel='sine angle'
 )
-ax.colorbar(m, loc='b', maxn=10, label=f'parametric coordinate')
+ax.colorbar(m, loc='b', maxn=10, label='parametric coordinate')
 
 
 # %% [raw] raw_mimetype="text/restructuredtext"

docs/conf.py

@@ -74,7 +74,7 @@
     'sphinx_copybutton',
     'sphinx_automodapi.automodapi',  # see: https://github.com/lukelbd/sphinx-automodapi/tree/proplot-mods # noqa
     'nbsphinx',
-    ]
+]
 
 extlinks = {
     'issue': ('https://github.com/lukelbd/proplot/issues/%s', 'GH#'),

proplot/axes/base.py

@@ -329,7 +329,7 @@ def _range_gridspec(self, x):
         Return the column or row gridspec range for the axes.
         """
         if not hasattr(self, 'get_subplotspec'):
-            raise RuntimeError(f'Axes is not a subplot.')
+            raise RuntimeError('Axes is not a subplot.')
         ss = self.get_subplotspec()
         if hasattr(ss, 'get_active_rows_columns'):
             func = ss.get_active_rows_columns
@@ -1180,7 +1180,7 @@ def colorbar(
             ticklocation = kwargs.pop('ticklocation', None) or ticklocation
             if ticklocation is not None and ticklocation != 'bottom':
                 warnings._warn_proplot(
-                    f'Inset colorbars can only have ticks on the bottom.'
+                    'Inset colorbars can only have ticks on the bottom.'
                 )
             kwargs.update({
                 'orientation': 'horizontal', 'ticklocation': 'bottom'

proplot/axes/geo.py

@@ -760,7 +760,7 @@ def projection(self):
     def projection(self, map_projection):
         import cartopy.crs as ccrs
         if not isinstance(map_projection, ccrs.CRS):
-            raise ValueError(f'Projection must be a cartopy.crs.CRS instance.')
+            raise ValueError('Projection must be a cartopy.crs.CRS instance.')
         self._map_projection = map_projection
 
     # Wrapped methods
@@ -1074,7 +1074,7 @@ def projection(self):
     def projection(self, map_projection):
         import mpl_toolkits.basemap as mbasemap
         if not isinstance(map_projection, mbasemap.Basemap):
-            raise ValueError(f'Projection must be a basemap.Basemap instance.')
+            raise ValueError('Projection must be a basemap.Basemap instance.')
         self._map_projection = map_projection
 
     # Wrapped methods

proplot/axes/plot.py

@@ -1315,12 +1315,12 @@ def bar_wrapper(
     # sense do document here; figure out way to move it here?
     if left is not None:
         warnings._warn_proplot(
-            f'The "left" keyword with bar() is deprecated. Use "x" instead.'
+            'The "left" keyword with bar() is deprecated. Use "x" instead.'
         )
         x = left
     if x is None and height is None:
         raise ValueError(
-            f'bar() requires at least 1 positional argument, got 0.'
+            'bar() requires at least 1 positional argument, got 0.'
         )
     elif height is None:
         x, height = None, x
@@ -1353,7 +1353,7 @@ def barh_wrapper(
     kwargs.setdefault('orientation', 'horizontal')
     if y is None and width is None:
         raise ValueError(
-            f'barh() requires at least 1 positional argument, got 0.'
+            'barh() requires at least 1 positional argument, got 0.'
         )
     return self.bar(x=left, height=height, width=width, bottom=y, **kwargs)
 
@@ -1521,7 +1521,7 @@ def violinplot_wrapper(
     # Sanitize input
     lw = _not_none(lw=lw, linewidth=linewidth)
     if kwargs.pop('showextrema', None):
-        warnings._warn_proplot(f'Ignoring showextrema=True.')
+        warnings._warn_proplot('Ignoring showextrema=True.')
     if 'showmeans' in kwargs:
         kwargs.setdefault('means', kwargs.pop('showmeans'))
     if 'showmedians' in kwargs:
@@ -2760,7 +2760,7 @@ def legend_wrapper(
             )
         if overridden:
             warnings._warn_proplot(
-                f'Ignoring user input properties '
+                'Ignoring user input properties '
                 + ', '.join(map(repr, overridden))
                 + ' for centered-row legend.'
             )
@@ -2780,7 +2780,7 @@ def legend_wrapper(
         ymin, ymax = None, None
         if order == 'F':
             raise NotImplementedError(
-                f'When center=True, ProPlot vertically stacks successive '
+                'When center=True, ProPlot vertically stacks successive '
                 'single-row legends. Column-major (order="F") ordering '
                 'is un-supported.'
             )
@@ -3344,6 +3344,7 @@ def _redirect(func):
     be applied on the base axes class, not the basemap axes.
     """
     name = func.__name__
+
     @functools.wraps(func)
     def _wrapper(self, *args, **kwargs):
         if getattr(self, 'name', '') == 'basemap':
@@ -3361,6 +3362,7 @@ def _norecurse(func):
     """
     name = func.__name__
     func._has_recurred = False
+
     @functools.wraps(func)
     def _wrapper(self, *args, **kwargs):
         if func._has_recurred:

proplot/colors.py

@@ -1097,7 +1097,7 @@ def to_listed(self, samples=10, **kwargs):
         if isinstance(samples, Integral):
             samples = np.linspace(0, 1, samples)
         elif not np.iterable(samples):
-            raise TypeError(f'Samples must be integer or iterable.')
+            raise TypeError('Samples must be integer or iterable.')
         samples = np.asarray(samples)
         colors = self(samples)
         kwargs.setdefault('name', self.name)
@@ -1818,7 +1818,7 @@ def __init__(
         if not norm:
             norm = mcolors.Normalize()
         elif isinstance(norm, mcolors.BoundaryNorm):
-            raise ValueError(f'Normalizer cannot be instance of BoundaryNorm.')
+            raise ValueError('Normalizer cannot be instance of BoundaryNorm.')
         elif not isinstance(norm, mcolors.Normalize):
             raise ValueError('Normalizer must be instance of Normalize.')
         extend = extend or 'neither'

proplot/constructor.py

@@ -264,7 +264,7 @@ def _mod_colormap(cmap, *, cut, left, right, shift, reverse, samples):
         if isinstance(cmap, pcolors.ListedColormap):
             if cut is not None:
                 warnings._warn_proplot(
-                    f"Invalid argument 'cut' for ListedColormap. Ignoring."
+                    "Invalid argument 'cut' for ListedColormap. Ignoring."
                 )
             cmap = cmap.truncate(left=left, right=right)
         else:
@@ -415,7 +415,7 @@ def Colormap(
     # how to make colormaps cyclic.
     if not args:
         raise ValueError(
-            f'Colormap() requires at least one positional argument.'
+            'Colormap() requires at least one positional argument.'
         )
     if listmode not in ('listed', 'linear', 'perceptual'):
         raise ValueError(
@@ -1305,7 +1305,7 @@ def Proj(name, basemap=None, **kwargs):
         import mpl_toolkits.basemap as mbasemap
         if _version_mpl >= _version('3.3'):
             raise RuntimeError(
-                f'Basemap is no longer maintained and is incompatible with '
+                'Basemap is no longer maintained and is incompatible with '
                 'matplotlib >= 3.3. Please use cartopy as your cartographic '
                 'plotting backend or downgrade to matplotlib <=3.2.'
             )
@@ -1333,7 +1333,7 @@ def Proj(name, basemap=None, **kwargs):
             kwproj.pop('central_latitude', None)
         if 'boundinglat' in kwproj:
             raise ValueError(
-                f'"boundinglat" must be passed to the ax.format() command '
+                '"boundinglat" must be passed to the ax.format() command '
                 'for cartopy axes.'
             )
         if crs is None:

proplot/demos.py

@@ -279,7 +279,7 @@ def show_channels(
     """
     # Figure and plot
     if not args:
-        raise ValueError(f'At least one positional argument required.')
+        raise ValueError('At least one positional argument required.')
     array = [[1, 1, 2, 2, 3, 3]]
     labels = ('Hue', 'Chroma', 'Luminance')
     if saturation:

proplot/figure.py

@@ -254,9 +254,9 @@ def __init__(
         spanx = _not_none(spanx, span, 0 if sharex == 0 else None, rc['span'])
         spany = _not_none(spany, span, 0 if sharey == 0 else None, rc['span'])
         if spanx and (alignx or align):
-            warnings._warn_proplot(f'"alignx" has no effect when spanx=True.')
+            warnings._warn_proplot('"alignx" has no effect when spanx=True.')
         if spany and (aligny or align):
-            warnings._warn_proplot(f'"aligny" has no effect when spany=True.')
+            warnings._warn_proplot('"aligny" has no effect when spany=True.')
         alignx = _not_none(alignx, align, rc['align'])
         aligny = _not_none(aligny, align, rc['align'])
         self.set_alignx(alignx)
@@ -483,8 +483,8 @@ def _align_labels_axis(self, b=True):
                             grp.join(axs[0], ax)
                     elif align:
                         warnings._warn_proplot(
-                            f'Aligning *x* and *y* axis labels required '
-                            f'matplotlib >=3.1.0'
+                            'Aligning *x* and *y* axis labels required '
+                            'matplotlib >=3.1.0'
                         )
                 if not span:
                     continue
@@ -813,7 +813,7 @@ def _insert_row_column(
                     gridspec_ss._subplot_spec = subplotspec_new
                 else:
                     raise ValueError(
-                        f'Unexpected GridSpecFromSubplotSpec nesting.'
+                        'Unexpected GridSpecFromSubplotSpec nesting.'
                     )
                 ax.update_params()
                 ax.set_position(ax.figbox)