Skip to content

Commit 0ff9630

Browse files
committed
Merge branch 'linter_fix' into v4.1.0-syntron
2 parents b2499f1 + 033e3a8 commit 0ff9630

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

OMPython/ModelicaSystem.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,10 @@ def parse_simflags(simflags: str) -> dict[str, Optional[str | dict[str, Any] | n
290290
291291
The return data can be used as input for self.args_set().
292292
"""
293-
warnings.warn("The argument 'simflags' is depreciated and will be removed in future versions; "
294-
"please use 'simargs' instead", DeprecationWarning, stacklevel=2)
293+
warnings.warn(message="The argument 'simflags' is depreciated and will be removed in future versions; "
294+
"please use 'simargs' instead",
295+
category=DeprecationWarning,
296+
stacklevel=2)
295297

296298
simargs: dict[str, Optional[str | dict[str, Any] | numbers.Number]] = {}
297299

@@ -584,7 +586,7 @@ def buildModel(self, variableFilter: Optional[str] = None):
584586

585587
def sendExpression(self, expr: str, parsed: bool = True) -> Any:
586588
try:
587-
retval = self._session.sendExpression(expr, parsed)
589+
retval = self._session.sendExpression(command=expr, parsed=parsed)
588590
except OMCSessionException as ex:
589591
raise ModelicaSystemError(f"Error executing {repr(expr)}: {ex}") from ex
590592

@@ -1611,9 +1613,9 @@ def _createCSVData(self, csvfile: Optional[OMCPath] = None) -> OMCPath:
16111613
for signal_name, signal_values in inputs.items():
16121614
signal = np.array(signal_values)
16131615
interpolated_inputs[signal_name] = np.interp(
1614-
all_times,
1615-
signal[:, 0], # times
1616-
signal[:, 1], # values
1616+
x=all_times,
1617+
xp=signal[:, 0], # times
1618+
fp=signal[:, 1], # values
16171619
)
16181620

16191621
# Write CSV file

OMPython/OMCSession.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,10 @@ def run_model_executable(cmd_run_data: OMCSessionRunData) -> int:
847847
return returncode
848848

849849
def execute(self, command: str):
850-
warnings.warn("This function is depreciated and will be removed in future versions; "
851-
"please use sendExpression() instead", DeprecationWarning, stacklevel=2)
850+
warnings.warn(message="This function is depreciated and will be removed in future versions; "
851+
"please use sendExpression() instead",
852+
category=DeprecationWarning,
853+
stacklevel=2)
852854

853855
return self.sendExpression(command, parsed=False)
854856

0 commit comments

Comments
 (0)