[ModelicaSystem] rename _prepare_inputdata() => _prepare_input_data()

Author: syntron

OMPython/ModelicaSystem.py

@@ -1117,8 +1117,8 @@ def getSolutions(self, varList: Optional[str | list[str]] = None, resultfile: Op
         return np_res
 
     @staticmethod
-    def _prepare_inputdata(
-            rawinput: str | list[str] | dict[str, str | int | float],
+    def _prepare_input_data(
+            raw_input: str | list[str] | dict[str, str | int | float],
     ) -> dict[str, str]:
         """
         Convert raw input to a structured dictionary {'key1': 'value1', 'key2': 'value2'}.
@@ -1136,36 +1136,36 @@ def prepare_str(str_in: str) -> dict[str, str]:
 
         input_data: dict[str, str] = {}
 
-        if isinstance(rawinput, str):
+        if isinstance(raw_input, str):
             warnings.warn(message="The definition of values to set should use a dictionary, "
                                   "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
                                   "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]",
                           category=DeprecationWarning,
                           stacklevel=3)
-            return prepare_str(rawinput)
+            return prepare_str(raw_input)
 
-        if isinstance(rawinput, list):
+        if isinstance(raw_input, list):
             warnings.warn(message="The definition of values to set should use a dictionary, "
                                   "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
                                   "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]",
                           category=DeprecationWarning,
                           stacklevel=3)
 
-            for item in rawinput:
+            for item in raw_input:
                 input_data |= prepare_str(item)
 
             return input_data
 
-        if isinstance(rawinput, dict):
-            for key, val in rawinput.items():
+        if isinstance(raw_input, dict):
+            for key, val in raw_input.items():
                 str_val = str(val)
                 if ' ' in key or ' ' in str_val:
                     raise ModelicaSystemError(f"Spaces not allowed in key/value pairs: {repr(key)} = {repr(val)}!")
                 input_data[key] = str_val
 
             return input_data
 
-        raise ModelicaSystemError(f"Invalid type of input: {type(rawinput)}")
+        raise ModelicaSystemError(f"Invalid type of input: {type(raw_input)}")
 
     def _set_method_helper(
             self,
@@ -1240,7 +1240,7 @@ def setContinuous(
         >>> setContinuous(["Name1=value1","Name2=value2"])  # depreciated
         >>> setContinuous(cvals={"Name1": "value1", "Name2": "value2"})
         """
-        inputdata = self._prepare_inputdata(rawinput=cvals)
+        inputdata = self._prepare_input_data(raw_input=cvals)
 
         return self._set_method_helper(
             inputdata=inputdata,
@@ -1260,7 +1260,7 @@ def setParameters(
         >>> setParameters(["Name1=value1","Name2=value2"])  # depreciated
         >>> setParameters(pvals={"Name1": "value1", "Name2": "value2"})
         """
-        inputdata = self._prepare_inputdata(rawinput=pvals)
+        inputdata = self._prepare_input_data(raw_input=pvals)
 
         return self._set_method_helper(
             inputdata=inputdata,
@@ -1280,7 +1280,7 @@ def setSimulationOptions(
         >>> setSimulationOptions(["Name1=value1","Name2=value2"])  # depreciated
         >>> setSimulationOptions(simOptions={"Name1": "value1", "Name2": "value2"})
         """
-        inputdata = self._prepare_inputdata(rawinput=simOptions)
+        inputdata = self._prepare_input_data(raw_input=simOptions)
 
         return self._set_method_helper(
             inputdata=inputdata,
@@ -1300,7 +1300,7 @@ def setLinearizationOptions(
         >>> setLinearizationOptions(["Name1=value1","Name2=value2"])  # depreciated
         >>> setLinearizationOptions(linearizationOtions={"Name1": "value1", "Name2": "value2"})
         """
-        inputdata = self._prepare_inputdata(rawinput=linearizationOptions)
+        inputdata = self._prepare_input_data(raw_input=linearizationOptions)
 
         return self._set_method_helper(
             inputdata=inputdata,
@@ -1317,7 +1317,7 @@ def setOptimizationOptions(self, optimizationOptions: str | list[str] | dict[str
         >>> setOptimizationOptions(["Name1=value1","Name2=value2"])  # depreciated
         >>> setOptimizationOptions(optimizationOptions={"Name1": "value1", "Name2": "value2"})
         """
-        inputdata = self._prepare_inputdata(rawinput=optimizationOptions)
+        inputdata = self._prepare_input_data(raw_input=optimizationOptions)
 
         return self._set_method_helper(
             inputdata=inputdata,
@@ -1337,7 +1337,7 @@ def setInputs(
         >>> setInputs(["Name1=value1","Name2=value2"])  # depreciated
         >>> setInputs(name={"Name1": "value1", "Name2": "value2"})
         """
-        # inputdata = self._prepare_inputdata(rawinput=name)
+        # inputdata = self._prepare_input_data(raw_input=name)
 
         if isinstance(name, str):
             name1: str = name