More pylint fixes to sample code and scripts

Author: gb119

Stoner/core/Typing.py

@@ -21,7 +21,7 @@
     "Typing",
 ]
 
-from . import Typing, array, base, exceptions, utils
+from . import array, base, exceptions, utils
 from .array import DataArray
 from .base import RegexpDict, TypeHintedDict, metadataObject, string_to_type
 from .setas import Setas as _setas

Stoner/core/__init__.py

@@ -22,7 +22,7 @@
 from ..compat import _pattern_type, int_types, string_types
 from ..tools import iscomparable, isiterable
 from .exceptions import StonerAssertionError
-from .Typing import Filename, RegExp, String_Types
+from ..tools.typing import Filename, RegExp
 
 try:
     from blist import sorteddict as SortedDict
@@ -65,7 +65,7 @@ def literal_eval(string: str) -> Any:
         raise ValueError(f"Cannot interpret {string} as valid Python") from err
 
 
-def string_to_type(value: String_Types) -> Any:
+def string_to_type(value: str) -> Any:
     """Given a string value try to work out if there is a better python type dor the value.
 
     First of all the first character is checked to see if it is a [ or { which would

Stoner/core/base.py

@@ -510,8 +510,8 @@ def new_figure(self, figure=False, projection="rectilinear", figsize=None, no_ax
         if no_axes:
             fig = plt.figure(figsize=figsize, **kargs)
             # Remove any auto-created axes if present (defensive)
-            for ax in list(fig.axes):
-                ax.remove()
+            for axis in list(fig.axes):
+                axis.remove()
             return fig, None
 
         # Standard 2D case: prefer subplots for users expecting a (fig, ax) pair

Stoner/plot/formats.py

@@ -16,7 +16,7 @@
 from ..compat import bytes2str, path_types, str2bytes, string_types
 from ..core.base import SortedMultivalueDict, metadataObject
 from ..core.exceptions import StonerLoadError, StonerUnrecognisedFormat
-from ..core.Typing import Filename
+from ..tools.typing import Filename
 from .decorators import make_Data, make_Image
 from .widgets import fileDialog
 

Stoner/tools/file.py

@@ -11,25 +11,25 @@
     from ..core.setas import setas
     from ..image.core import ImageArray, ImageFile
 else:
-    setas = type("setas", (), {})
+    Setas = type("Setas", (), {})
     Data = type("Data", (), {})
     ImageArray = type("ImageArray", (), {})
     ImageFile = type("ImageFile", (), {})
 
 Args = Tuple[Any]
 Kwargs = Mapping[str, Any]
-Single_Index = Union[str, int, Pattern]
-Index = Union[Single_Index, Sequence[Union[int, str, Pattern]]]
+SingleIndex = Union[str, int, Pattern]
+Index = Union[SingleIndex, Sequence[Union[int, str, Pattern]]]
 Filename = Union[str, Path, bool]
 
 RegExp = Pattern
-Path_Types = Filename
+PathTypes = Filename
 
 
 # Setas
 Setas_Base = Sequence[str]
 Setas_Dict = Mapping[str, Index]
-Setas = Union[Setas_Base, Setas_Dict, str, setas]
+Setas = Union[Setas_Base, Setas_Dict, str, Setas]
 
 # Other useful types
 Numeric = Union[float, int, complex]

Stoner/tools/typing.py

@@ -1,6 +1,6 @@
 """3D surface plot example."""
 
-# pylint: disable=invalid-name
+# pylint: disable=invalid-name, no-name-in-module
 import matplotlib.cm
 import numpy as np
 

doc/samples/3D_plot.py

@@ -1,6 +1,6 @@
 """Use curve_fit to fit a plane to some data."""
 
-# pylint: disable=invalid-name
+# pylint: disable=invalid-name, no-name-in-module, no-member
 import matplotlib.cm as cmap
 from numpy import array, column_stack, linspace, meshgrid
 from numpy.random import normal, seed
@@ -43,9 +43,7 @@ def plane(coord, a, b, c):
 e.plot_xyz(linewidth=0, cmap=cmap.jet, alpha=0.5, figure=d.fig)
 
 txt = "$z=c-ax+by$\n"
-txt += "\n".join(
-    [d.format("plane:{}".format(k), latex=True) for k in ["a", "b", "c"]]
-)
+txt += "\n".join([d.format(f"plane:{k}", latex=True) for k in ["a", "b", "c"]])
 
 ax = d.axes[0]
 ax.text(-30, -10, 10, txt)

doc/samples/curve_fit_plane.py

@@ -18,7 +18,7 @@
 d.text(
     -6,
     -800,
-    "Coefficients\n{}".format(str_coeffs),
+    f"Coefficients\n{str_coeffs}",
     fontdict={"size": "x-small"},
 )
 d.ylabel = "Data"

doc/samples/decompose.py

@@ -12,7 +12,10 @@
 
 d = Data(x, y, column_headers=["Time", "Signal"], setas="xy")
 
-func = lambda x, A, B, C: A + B * exp(-x / C)
+
+def func(x, A, B, C):
+    """Quick fitting function."""
+    return A + B * exp(-x / C)
 
 
 # Do the fitting and plot the result