Fix some code issues from codacy

Author: gb119

Stoner/Image/imagefuncs.py

@@ -360,6 +360,7 @@ def convert(image, dtype, force_copy=False, uniform=False, normalise=True):
         result = np.where(~image, *dtype_range[dtype])
         return result
 
+    imax = imin = imax_in = imin_in = None
     if dtypeobj.kind in "ui":
         imin = np.iinfo(dtype).min
         imax = np.iinfo(dtype).max

Stoner/analysis/filtering.py

@@ -292,30 +292,33 @@ def extrapolate(self, new_x, xcol=None, ycol=None, yerr=None, overlap=20, kind="
         work = self.clone
         for ix, x in enumerate(new_x):
             r = self.closest(x, xcol=_.xcol)
-            if isinstance(overlap, int):
-                if (r.i - overlap / 2) < 0:
-                    ll = 0
-                    hl = min(len(self), overlap)
-                elif (r.i + overlap / 2) > len(self):
-                    hl = len(self)
-                    ll = max(hl - overlap, 0)
-                else:
-                    ll = r.i - overlap / 2
-                    hl = r.i + overlap / 2
-                bounds = {"_i__between": (ll, hl)}
-                mid_x = (self[ll, _.xcol] + self[hl - 1, _.xcol]) / 2.0
-            elif isinstance(overlap, float):
-                if (r[_.xcol] - overlap / 2) < self.min(_.xcol)[0]:
-                    ll = self.min(_.xcol)[0]
-                    hl = ll + overlap
-                elif (r[_.xcol] + overlap / 2) > self.max(_.xcol)[0]:
-                    hl = self.max(_.xcol)[0]
-                    ll = hl - overlap
-                else:
-                    ll = r[_.xcol] - overlap / 2
-                    hl = r[_.xcol] + overlap / 2
-                bounds = {f"{self.column_headers[_.xcol]}__between": (ll, hl)}
-                mid_x = (ll + hl) / 2.0
+            match overlap:
+                case int():
+                    if (r.i - overlap / 2) < 0:
+                        ll = 0
+                        hl = min(len(self), overlap)
+                    elif (r.i + overlap / 2) > len(self):
+                        hl = len(self)
+                        ll = max(hl - overlap, 0)
+                    else:
+                        ll = r.i - overlap / 2
+                        hl = r.i + overlap / 2
+                    bounds = {"_i__between": (ll, hl)}
+                    mid_x = (self[ll, _.xcol] + self[hl - 1, _.xcol]) / 2.0
+                case float():
+                    if (r[_.xcol] - overlap / 2) < self.min(_.xcol)[0]:
+                        ll = self.min(_.xcol)[0]
+                        hl = ll + overlap
+                    elif (r[_.xcol] + overlap / 2) > self.max(_.xcol)[0]:
+                        hl = self.max(_.xcol)[0]
+                        ll = hl - overlap
+                    else:
+                        ll = r[_.xcol] - overlap / 2
+                        hl = r[_.xcol] + overlap / 2
+                    bounds = {f"{self.column_headers[_.xcol]}__between": (ll, hl)}
+                    mid_x = (ll + hl) / 2.0
+                case _:
+                    raise TypeError(f"Overlap should be an integer or floating point number not a {type(overlap)}")
             pointdata = work.select(**bounds)
             pointdata.data[:, _.xcol] = pointdata.column(_.xcol) - mid_x
             ret = pointdata.curve_fit(kindf, _.xcol, _.ycol, sigma=_.yerr, absolute_sigma=True)

Stoner/core/setas.py

@@ -4,11 +4,11 @@
 __all__ = ["setas"]
 import re
 import copy
-from collections.abc import MutableMapping, Mapping, Iterable
+from collections.abc import MutableMapping, Iterable
 
 import numpy as np
 
-from ..compat import string_types, int_types, index_types, _pattern_type
+from ..compat import string_types, index_types, _pattern_type
 from ..tools import AttributeStore, isiterable, typedList, isLikeList
 from .utils import decode_string
 
@@ -339,7 +339,8 @@ def __contains__(self, item):
     def __delitem__(self, name):
         """Unset either by column index or column assignment.
 
-        Equivalent to unsetting the same object."""
+        Equivalent to unsetting the same object.
+        """
         self.unset(name)
 
     def __eq__(self, other):
@@ -445,7 +446,7 @@ def __setitem__(self, name, value):
             case "x" | "y" | "z" | "u" | "v" | "w" | "d" | "e" | "f" | "." | "-":
                 for c in self.find_col(value, force_list=True):
                     self._setas[c] = name
-            case int() | str() | _pattern_type() if value in [letter for letter in "xyzuvwdef.-"]:
+            case int() | str() | _pattern_type() if value in list("xyzuvwdef.-"):
                 for c in self.find_col(name, force_list=True):
                     self.setas[c] = value
             case _:
@@ -646,21 +647,24 @@ def get(self, key, default=None):  # pylint:  disable=arguments-differ
     def keys(self):
         """Access mapping keys.
 
-        Mapping keys are the same as iterating over the unique headers"""
+        Mapping keys are the same as iterating over the unique headers
+        """
         for c in self._unique_headers:
             yield c
 
     def values(self):
         """Access mapping values.
 
-        Mapping values are the same as iterating over setas."""
+        Mapping values are the same as iterating over setas.
+        """
         for v in self.setas:
             yield v
 
     def items(self):
         """Access mapping items.
 
-        Mapping items iterates over keys and values."""
+        Mapping items iterates over keys and values.
+        """
         for k, v in zip(self._unique_headers, self.setas):
             yield k, v
 
@@ -746,7 +750,8 @@ def to_dict(self):
         """Return the setas attribute as a dictionary.
 
         If multiple columns are assigned to the same type, then the column names are
-        returned as a list. If column headers are duplicated"""
+        returned as a list. If column headers are duplicated.
+        """
         ret = dict()
         for k, ch in zip(self._setas, self._unique_headers):
             if k != ".":
@@ -766,7 +771,8 @@ def to_list(self):
     def to_string(self, encode=False):
         """Return the setas attribute encoded as a string.
 
-        Optionally replaces runs of 3 or more identical characters with a precediung digit."""
+        Optionally replaces runs of 3 or more identical characters with a precediung digit.
+        """
         expanded = "".join(self)
         if encode:
             pat = re.compile(r"((.)\2{2,9})")