Skip to content

[OMCProcess*] use pathlib #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[OMCProcess*] use pathlib #332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions OMPython/OMCSession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,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)
Expand All @@ -536,7 +536,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)
Expand Down Expand Up @@ -605,7 +605,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:
Expand All @@ -615,7 +615,7 @@ def __init__(
dockerExtraArgs = []

self._dockerExtraArgs = dockerExtraArgs
self._dockerOpenModelicaPath = dockerOpenModelicaPath
self._dockerOpenModelicaPath = pathlib.PurePosixPath(dockerOpenModelicaPath)
self._dockerNetwork = dockerNetwork

self._interactivePort = port
Expand Down Expand Up @@ -712,7 +712,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:
Expand Down Expand Up @@ -796,7 +796,7 @@ def _docker_omc_cmd(
]
+ self._dockerExtraArgs
+ dockerNetworkStr
+ [self._docker, self._dockerOpenModelicaPath]
+ [self._docker, self._dockerOpenModelicaPath.as_posix()]
+ omc_path_and_args_list
+ extraFlags)

Expand Down Expand Up @@ -853,7 +853,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:
Expand Down Expand Up @@ -904,7 +904,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)

Expand Down
Loading