Merge branch 'OMCProcess_pathlib' into ModelicaSystemCmd_use_OMCPath

Author: syntron

OMPython/OMCSession.py

@@ -861,7 +861,7 @@ class OMCProcessLocal(OMCProcess):
     def __init__(
             self,
             timeout: float = 10.00,
-            omhome: Optional[str] = None,
+            omhome: Optional[str | os.PathLike] = None,
     ) -> None:
 
         super().__init__(timeout=timeout)
@@ -874,7 +874,7 @@ def __init__(
         self._omc_port = self._omc_port_get()
 
     @staticmethod
-    def _omc_home_get(omhome: Optional[str] = None) -> pathlib.Path:
+    def _omc_home_get(omhome: Optional[str | os.PathLike] = None) -> pathlib.Path:
         # use the provided path
         if omhome is not None:
             return pathlib.Path(omhome)
@@ -985,7 +985,7 @@ def __init__(
             self,
             timeout: float = 10.00,
             dockerExtraArgs: Optional[list] = None,
-            dockerOpenModelicaPath: str = "omc",
+            dockerOpenModelicaPath: str | os.PathLike = "omc",
             dockerNetwork: Optional[str] = None,
             port: Optional[int] = None,
     ) -> None:
@@ -995,7 +995,7 @@ def __init__(
             dockerExtraArgs = []
 
         self._dockerExtraArgs = dockerExtraArgs
-        self._dockerOpenModelicaPath = dockerOpenModelicaPath
+        self._dockerOpenModelicaPath = pathlib.PurePosixPath(dockerOpenModelicaPath)
         self._dockerNetwork = dockerNetwork
 
         self._interactivePort = port
@@ -1098,7 +1098,7 @@ def __init__(
             timeout: float = 10.00,
             docker: Optional[str] = None,
             dockerExtraArgs: Optional[list] = None,
-            dockerOpenModelicaPath: str = "omc",
+            dockerOpenModelicaPath: str | os.PathLike = "omc",
             dockerNetwork: Optional[str] = None,
             port: Optional[int] = None,
     ) -> None:
@@ -1182,7 +1182,7 @@ def _docker_omc_cmd(
                        ]
                        + self._dockerExtraArgs
                        + dockerNetworkStr
-                       + [self._docker, self._dockerOpenModelicaPath]
+                       + [self._docker, self._dockerOpenModelicaPath.as_posix()]
                        + omc_path_and_args_list
                        + extraFlags)
 
@@ -1239,7 +1239,7 @@ def __init__(
             timeout: float = 10.00,
             dockerContainer: Optional[str] = None,
             dockerExtraArgs: Optional[list] = None,
-            dockerOpenModelicaPath: str = "omc",
+            dockerOpenModelicaPath: str | os.PathLike = "omc",
             dockerNetwork: Optional[str] = None,
             port: Optional[int] = None,
     ) -> None:
@@ -1290,7 +1290,7 @@ def _docker_omc_cmd(self, omc_path_and_args_list) -> list:
                            "--user", str(self._getuid()),
                        ]
                        + self._dockerExtraArgs
-                       + [self._dockerCid, self._dockerOpenModelicaPath]
+                       + [self._dockerCid, self._dockerOpenModelicaPath.as_posix()]
                        + omc_path_and_args_list
                        + extraFlags)