Reanme some private members in metadtaObject base

Author: gb119

Stoner/compat.py

@@ -129,7 +129,7 @@ def get_filedialog(what="file", **opts):
     funcs = {"file": "OpenFile", "directory": "SelectDirectory", "files": "OpenFiles", "save": "SaveFile"}
     if what not in funcs:
         raise RuntimeError(f"Unable to recognise required file dialog type:{what}")
-    return fileDialog.openDialog(mode=funcs[what], **opts)
+    return fileDialog.open_dialog(mode=funcs[what], **opts)
 
 
 if np_version.major >= 2:

Stoner/core/base.py

@@ -259,23 +259,23 @@ class TypeHintedDict(RegexpDict):
     Attributes:
         _typehints (dict):
             The backing store for the type hint information
-        __regexGetType (re):
+        _regex_get_type (re):
             Used to extract the type hint from a string
-        __regexSignedInt (re):
+        _regex_signed_int (re):
             matches type hint strings for signed integers
-        __regexUnsignedInt (re):
+        _regex_unsigned_int (re):
             matches the type hint string for unsigned integers
-        __regexFloat (re):
+        _regex_float (re):
             matches the type hint strings for floats
-        __regexBoolean (re):
+        _regex_boolean (re):
             matches the type hint string for a boolean
-        __regexStrng (re):
+        _regex_strng (re):
             matches the type hint string for a string variable
-        __regexEvaluatable (re):
+        _regex_evaluatable (re):
             matches the type hint string for a compoind data type
-        __types (dict):
+        _types (dict):
             mapping of type hinted types to actual Python types
-        __tests (dict):
+        _tests (dict):
             mapping of the regex patterns to actual python types
 
     Notes:
@@ -287,20 +287,20 @@ class TypeHintedDict(RegexpDict):
     allowed_keys: Tuple = string_types
     # Force metadata keys to be strings
 
-    __regexGetType: RegExp = re.compile(r"([^\{]*)\{([^\}]*)\}")
+    _regex_get_type: RegExp = re.compile(r"([^\{]*)\{([^\}]*)\}")
     # Match the contents of the inner most{}
-    __regexSignedInt: RegExp = re.compile(r"^I\d+")
+    _regex_signed_int: RegExp = re.compile(r"^I\d+")
     # Matches all signed integers
     __regexUnsignedInt: RegExp = re.compile(r"^U / d+")
     # Match unsigned integers
-    __regexFloat: RegExp = re.compile(r"^(Extended|Double|Single)\sFloat")
+    _regex_float: RegExp = re.compile(r"^(Extended|Double|Single)\sFloat")
     # Match floating point types
-    __regexBoolean: RegExp = re.compile(r"^Boolean")
+    _regex_boolean: RegExp = re.compile(r"^Boolean")
     __regexString = re.compile(r"^(String|Path|Enum)")
     __regexTimestamp: RegExp = re.compile(r"Timestamp")
-    __regexEvaluatable: RegExp = re.compile(r"^(Cluster||\d+D Array|List)")
+    _regex_evaluatable: RegExp = re.compile(r"^(Cluster||\d+D Array|List)")
 
-    __types: Dict[str, Type] = dict(
+    _types: Dict[str, Type] = dict(
         [  # Key order does matter here!
             ("Boolean", bool),
             ("I32", int),
@@ -313,17 +313,17 @@ class TypeHintedDict(RegexpDict):
             ("String", str),
         ]
     )
-    # This is the inverse of the __tests below - this gives
+    # This is the inverse of the _tests below - this gives
     # the string type for standard Python classes
 
-    __tests: List[Tuple] = [
-        (__regexSignedInt, int),
+    _tests: List[Tuple] = [
+        (_regex_signed_int, int),
         (__regexUnsignedInt, int),
-        (__regexFloat, float),
-        (__regexBoolean, bool),
+        (_regex_float, float),
+        (_regex_boolean, bool),
         (__regexTimestamp, datetime.datetime),
         (__regexString, str),
-        (__regexEvaluatable, _evaluatable()),
+        (_regex_evaluatable, _evaluatable()),
     ]
 
     # This is used to work out the correct python class for
@@ -374,7 +374,7 @@ def findtype(self, value: Any) -> str:
         typ = "Invalid Type"
         if value is None:
             return "Void"
-        for t, val in self.__types.items():
+        for t, val in self._types.items():
             if isinstance(value, val):
                 if t in ["Cluster", "AnonCluster"]:
                     elements = []
@@ -415,7 +415,7 @@ def __mungevalue(self, typ: str, value: Any) -> Any:
         """
         if typ == "Invalid Type":  # Short circuit here
             return repr(value)
-        for regexp, valuetype in self.__tests:
+        for regexp, valuetype in self._tests:
             if regexp.search(typ) is None:
                 continue
             if isinstance(valuetype, _evaluatable):
@@ -455,7 +455,7 @@ def _get_name_(self, name: Union[str, RegExp]) -> Tuple[str, Optional[str]]:
                 the type hint string),
         """
         search = str(name)
-        m = self.__regexGetType.search(search)
+        m = self._regex_get_type.search(search)
         if m is not None:
             return m.group(1), m.group(2)
         if not isinstance(name, string_types + int_types):

Stoner/folders/methods.py

@@ -84,7 +84,7 @@ def add_group(fldr, key):
     return fldr
 
 
-def all(fldr):
+def all(fldr):  # pylint: disable=redefined-builtin
     """Iterate over all the files in the Folder and all it's sub Folders recursely.
 
     Args:
@@ -224,9 +224,9 @@ def file(fldr, name, value, create=True, pathsplit=None):
     return tmp
 
 
-def filter(
+def filter(  # pylint: disable=redefined-builtin
     fldr, filter=None, invert=False, copy=False, recurse=False, prune=True
-):  # pylint: disable=redefined-builtin
+):
     r"""Filter the current set of files by some criterion.
 
     Args:

Stoner/tools/file.py

@@ -152,7 +152,7 @@ def file_dialog(mode: str, filename: Filename, filetype: str) -> Union[pathlib.P
         mode = "SaveFile"
     else:
         mode = "SelectDirectory"
-    filename = fileDialog.openDialog(start=dirname, mode=mode, patterns=patterns)
+    filename = fileDialog.open_dialog(start=dirname, mode=mode, patterns=patterns)
     return filename if filename else None
 
 

Stoner/tools/formatting.py

@@ -339,4 +339,4 @@ def ordinal(value: int) -> str:
     else:
         suffix = ["th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th"][last_digit]
 
-    return "{}{}".format(value, suffix)
+    return f"{value}{suffix}"

Stoner/tools/widgets.py

@@ -31,11 +31,11 @@
 if QT_VERSION is None:
 
     class App:
-        """Mock App that raises an error when you try to call openDialog on it."""
+        """Mock App that raises an error when you try to call open_dialog on it."""
 
         modes: Dict = {}
 
-        def openDialog(
+        def open_dialog(
             self,
             title: Optional[str] = None,
             start: Union[str, pathlib.Path] = "",
@@ -80,9 +80,9 @@ def __init__(self, *args: Any, **kargs: Any) -> None:
             self.top = 10
             self.width = 640
             self.height = 480
-            self.initUI()
+            self.init_ui()
 
-        def initUI(self) -> None:
+        def init_ui(self) -> None:
             """Initialise the UI and set the dialog box geometry."""
             self.dialog = QWidget()
             self.dialog.title = "PyQt5 file dialogs - pythonspot.com"
@@ -94,7 +94,7 @@ def initUI(self) -> None:
             self.dialog.setWindowTitle(self.title)
             self.dialog.setGeometry(self.left, self.top, self.width, self.height)
 
-        def openDialog(
+        def open_dialog(
             self,
             title: Optional[str] = None,
             start: Union[str, pathlib.Path] = "",

doc/samples/Fitting/Quadratic.py

@@ -23,7 +23,7 @@
 d.text(
     -9,
     450,
-    "Polynominal co-efficients\n{}".format(d["2nd-order polyfit coefficients"]),
+    "Polynominal co-efficients\n{d['2nd-order polyfit coefficients']}",
     fontdict={"size": "x-small", "color": "magenta"},
 )
 

scripts/VSManalysis_v2.py

@@ -185,7 +185,7 @@ def editData(Data, operations):
 for item in filenames:
     print(i, ". ", item)
     i += 1
-fCounter = int(
+f_counter = int(
     input(
         "Enter the number of the file you wish to start at (program will cycle through files from that point.):\n"
     )
@@ -196,8 +196,8 @@ def editData(Data, operations):
 timeout = 0
 # Main program loop, cycle through selected files
 while True:
-    path = filenames[fCounter]
-    fCounter += 1
+    path = filenames[f_counter]
+    f_counter += 1
     with open(path, "r", encoding="utf-8") as fr:
         data = fr.readlines()  # Get the file into an array
     pathsplit = splitFileName(path)
@@ -246,21 +246,21 @@ def editData(Data, operations):
         t = Data.clone  # edit a copied array.
         t = editData(t, operations)
         plotmH(t)
-        whatNext = input(
+        what_next = input(
             "Press enter to save changes, r to restart or q to quit the program:  "
         )
-        if whatNext == "r":
+        if what_next == "r":
             continue
-        if whatNext == "q":
+        if what_next == "q":
             break
         Data = t
         Data.save(
             "EditedFiles/" + pathsplit[0] + "_edit.txt"
         )  # overwrite the file created earlier
         break
     if (
-        whatNext == "q"
-        or input(f"Press enter to do file {filenames[fCounter]} or q to quit:")
+        what_next == "q"
+        or input(f"Press enter to do file {filenames[f_counter]} or q to quit:")
         == "q"
     ):
         break

tests/Stoner/tools/test_widgets.py

@@ -60,14 +60,14 @@ def dummy(mode="getOpenFileName"):
     app = getattr(widgets, "App")
     setattr(app, "modes", modes)
 
-    assert widgets.fileDialog.openDialog() == ret_pth
-    assert widgets.fileDialog.openDialog(title="Test", start=".") == ret_pth
-    assert widgets.fileDialog.openDialog(patterns={"*.bad": "Very bad files"}) == ret_pth
-    assert widgets.fileDialog.openDialog(mode="OpenFiles") == [ret_pth]
-    assert widgets.fileDialog.openDialog(mode="SaveFile") is None
-    assert widgets.fileDialog.openDialog(mode="SelectDirectory") == ret_pth.parent
+    assert widgets.fileDialog.open_dialog() == ret_pth
+    assert widgets.fileDialog.open_dialog(title="Test", start=".") == ret_pth
+    assert widgets.fileDialog.open_dialog(patterns={"*.bad": "Very bad files"}) == ret_pth
+    assert widgets.fileDialog.open_dialog(mode="OpenFiles") == [ret_pth]
+    assert widgets.fileDialog.open_dialog(mode="SaveFile") is None
+    assert widgets.fileDialog.open_dialog(mode="SelectDirectory") == ret_pth.parent
     with pytest.raises(ValueError):
-        widgets.fileDialog.openDialog(mode="Whateve")
+        widgets.fileDialog.open_dialog(mode="Whateve")
 
 
 def test_loader():