Skip to content

Commit 99572e4

Browse files
committed
[OMCProcess*] fix multiple inheritance
1 parent e21a723 commit 99572e4

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

OMPython/OMCSession.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,9 @@ class OMCProcess:
431431
def __init__(
432432
self,
433433
timeout: float = 10.00,
434+
**kwargs,
434435
) -> None:
436+
super().__init__(**kwargs)
435437

436438
# store variables
437439
self._timeout = timeout
@@ -598,7 +600,9 @@ def _omc_port_get(self) -> str:
598600

599601
class OMCProcessDockerHelper:
600602

601-
def __init__(self) -> None:
603+
def __init__(self, **kwargs) -> None:
604+
super().__init__(**kwargs)
605+
602606
self._dockerExtraArgs: list = []
603607
self._dockerOpenModelicaPath: Optional[str] = None
604608
self._dockerNetwork: Optional[str] = None
@@ -655,7 +659,7 @@ def get_docker_container_id(self) -> str:
655659
return self._dockerCid
656660

657661

658-
class OMCProcessDocker(OMCProcess, OMCProcessDockerHelper):
662+
class OMCProcessDocker(OMCProcessDockerHelper, OMCProcess):
659663

660664
def __init__(
661665
self,
@@ -830,7 +834,7 @@ def _omc_docker_start(self) -> Tuple[subprocess.Popen, DummyPopen]:
830834
return omc_process, docker_process
831835

832836

833-
class OMCProcessDockerContainer(OMCProcess, OMCProcessDockerHelper):
837+
class OMCProcessDockerContainer(OMCProcessDockerHelper, OMCProcess):
834838

835839
def __init__(
836840
self,

0 commit comments

Comments
 (0)