Further tweaks from pylint

Author: gb119

Stoner/formats/data/hdf5.py

@@ -156,7 +156,7 @@ def load_sls_stxm(new_data, *args, **kargs):
     items = list(f.items())
     if len(items) == 1 and items[0][0] == "entry1":
         group1 = list(f["entry1"])
-        if not "definition" in group1 or bytes2str(f["entry1"]["definition"][0]) != "NXstxm":  # Good HDF5
+        if "definition" not in group1 or bytes2str(f["entry1"]["definition"][0]) != "NXstxm":  # Good HDF5
             raise StonerLoadError("HDF5 file lacks single top level group called entry1")
     else:
         raise StonerLoadError("HDF5 file lacks single top level group called entry1")

Stoner/formats/data/instruments.py

@@ -271,45 +271,45 @@ def _parse_header(new_data, matched, value, key):
         newvalue = literal_eval(value)
     if newvalue == "-":
         newvalue = np.nan  # trap for missing float value
-    if matched:
-        key = matched.groups()[0]
-        idx = int(matched.groups()[1])
-        if key in new_data.metadata and not isinstance(new_data[key], (np.ndarray, list)):
-            if isinstance(new_data[key], str):
-                new_data[key] = list([new_data[key]])
-                if idx > 1:
-                    new_data[key].extend([""] * idx - 1)
-            else:
-                new_data[key] = np.array(new_data[key])
-                if idx > 1:
-                    new_data[key] = np.append(new_data[key], np.ones(idx - 1) * np.nan)
-        if key not in new_data.metadata:
-            if isinstance(newvalue, str):
-                listval = [""] * (idx + 1)
-                listval[idx] = newvalue
-                new_data[key] = listval
-            else:
-                arrayval = np.ones(idx + 1) * np.nan
-                arrayval = arrayval.astype(type(newvalue))
-                arrayval[idx] = newvalue
-                new_data[key] = arrayval
+    if not matched:
+        new_data.metadata[key] = newvalue
+        return new_data
+    key = matched.groups()[0]
+    idx = int(matched.groups()[1])
+    if key in new_data.metadata and not isinstance(new_data[key], (np.ndarray, list)):
+        if isinstance(new_data[key], str):
+            new_data[key] = list([new_data[key]])
+            if idx > 1:
+                new_data[key].extend([""] * idx - 1)
         else:
-            if isinstance(new_data[key][0], str) and isinstance(new_data[key], list):
-                if len(new_data[key]) < idx + 1:
-                    new_data[key].extend([""] * (idx + 1 - len(new_data[key])))
-                new_data[key][idx] = newvalue
-            else:
-                if idx + 1 > new_data[key].size:
-                    new_data[key] = np.append(
-                        new_data[key],
-                        (np.ones(idx + 1 - new_data[key].size) * np.nan).astype(new_data[key].dtype),
-                    )
-                try:
-                    new_data[key][idx] = newvalue
-                except ValueError:
-                    pass
+            new_data[key] = np.array(new_data[key])
+            if idx > 1:
+                new_data[key] = np.append(new_data[key], np.ones(idx - 1) * np.nan)
+    if key not in new_data.metadata:
+        if isinstance(newvalue, str):
+            listval = [""] * (idx + 1)
+            listval[idx] = newvalue
+            new_data[key] = listval
+        else:
+            arrayval = np.ones(idx + 1) * np.nan
+            arrayval = arrayval.astype(type(newvalue))
+            arrayval[idx] = newvalue
+            new_data[key] = arrayval
     else:
-        new_data.metadata[key] = newvalue
+        if isinstance(new_data[key][0], str) and isinstance(new_data[key], list):
+            if len(new_data[key]) < idx + 1:
+                new_data[key].extend([""] * (idx + 1 - len(new_data[key])))
+            new_data[key][idx] = newvalue
+        else:
+            if idx + 1 > new_data[key].size:
+                new_data[key] = np.append(
+                    new_data[key],
+                    (np.ones(idx + 1 - new_data[key].size) * np.nan).astype(new_data[key].dtype),
+                )
+            try:
+                new_data[key][idx] = newvalue
+            except ValueError:
+                pass
     return new_data
 
 

Stoner/formats/image/generic.py

@@ -116,7 +116,7 @@ def load_{name}file(new_image, *args, **kwargs):
             "make_Class": make_Class,
             "StonerLoadError": StonerLoadError,
         }
-        exec(CODE, namespace)  # pylint: disable=exec-used
+        exec(CODE, namespace)  # nosec pylint: disable=exec-used
         func = namespace[f"load_{name}file"]
         register_loader(patterns=patterns, mime_types=mime_types, name=name, what=WHAT)(func)
         setattr(sys.modules[__name__], f"load_{name}file", func)

Stoner/formats/maximus.py

@@ -191,9 +191,9 @@ def to_hdf5(self, filename=None):
                         parts = self._common_metadata.export(k).split("=")
                         metadata.attrs[k] = "=".join(parts[1:])
 
-            for g in self.groups:  # Recurse to save groups
+            for g, group in self.groups.items():  # Recurse to save groups
                 grp = f.require_group(g)
-                self.groups[g].to_hdf5(grp)
+                group.to_hdf5(grp)
 
             for ch in self._names:
                 signal = f.require_group(ch)

scripts/PCAR-New.py

@@ -23,6 +23,7 @@ def __init__(self, *args, **kargs):
         super().__init__(*args, **kargs)
 
     def load_config(self):
+        """Load the config file to set up the fitting."""
         my_file = inspect.getfile(self.__class__)
         inifile = my_file.replace(".py", ".ini")
         if not pathlib.Path(inifile).exists():