Skip to content

Commit 522d41d

Browse files
authored
Merge branch 'master' into update_init_docstring
2 parents a45ebac + aebb9f8 commit 522d41d

2 files changed

Lines changed: 17 additions & 14 deletions

File tree

OMPython/OMCSession.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def poll(self):
5050
return None if self.process.is_running() else True
5151

5252
def kill(self):
53-
return os.kill(self.pid, signal.SIGKILL)
53+
return os.kill(pid=self.pid, signal=signal.SIGKILL)
5454

5555
def wait(self, timeout):
5656
try:
@@ -854,10 +854,12 @@ def run_model_executable(self, cmd_run_data: OMCSessionRunData) -> int:
854854
return returncode
855855

856856
def execute(self, command: str):
857-
warnings.warn(message="This function is depreciated and will be removed in future versions; "
858-
"please use sendExpression() instead",
859-
category=DeprecationWarning,
860-
stacklevel=2)
857+
warnings.warn(
858+
message="This function is depreciated and will be removed in future versions; "
859+
"please use sendExpression() instead",
860+
category=DeprecationWarning,
861+
stacklevel=2,
862+
)
861863

862864
return self.sendExpression(command, parsed=False)
863865

OMPython/__init__.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,20 @@
2222
OMCPath,
2323
OMCSession,
2424
OMCSessionCmd,
25-
OMCSessionException,
26-
OMCSessionRunData,
27-
OMCSessionZMQ,
28-
OMCSessionPort,
29-
OMCSessionLocal,
3025
OMCSessionDocker,
3126
OMCSessionDockerContainer,
27+
OMCSessionException,
28+
OMCSessionLocal,
29+
OMCSessionPort,
30+
OMCSessionRunData,
3231
OMCSessionWSL,
32+
OMCSessionZMQ,
3333
)
3434

3535
# global names imported if import 'from OMPython import *' is used
3636
__all__ = [
3737
'LinearizationResult',
38+
3839
'ModelicaSystem',
3940
'ModelicaSystemCmd',
4041
'ModelicaSystemDoE',
@@ -44,12 +45,12 @@
4445

4546
'OMCSession',
4647
'OMCSessionCmd',
48+
'OMCSessionDocker',
49+
'OMCSessionDockerContainer',
4750
'OMCSessionException',
48-
'OMCSessionRunData',
49-
'OMCSessionZMQ',
5051
'OMCSessionPort',
5152
'OMCSessionLocal',
52-
'OMCSessionDocker',
53-
'OMCSessionDockerContainer',
53+
'OMCSessionRunData',
5454
'OMCSessionWSL',
55+
'OMCSessionZMQ',
5556
]

0 commit comments

Comments
 (0)