Skip to content

Commit c303fd8

Browse files
committed
[OMCProcessDocker*] rename class methods
1 parent 801637b commit c303fd8

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

OMPython/OMCSession.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ def __init__(
713713
self._interactivePort = port
714714

715715
# start up omc executable in docker container waiting for the ZMQ connection
716-
self._omc_process, self._docker_process, self._dockerCid = self._omc_docker_start()
716+
self._omc_process, self._docker_process, self._dockerCid = self._docker_omc_start()
717717
# connect to the running omc instance using ZMQ
718718
self._omc_port = self._omc_port_get()
719719

@@ -733,7 +733,7 @@ def __del__(self) -> None:
733733
finally:
734734
self._docker_process = None
735735

736-
def _omc_command_docker(
736+
def _docker_omc_cmd(
737737
self,
738738
omc_path_and_args_list: list[str],
739739
docker_cid_file: pathlib.Path,
@@ -783,12 +783,12 @@ def _omc_command_docker(
783783

784784
return omc_command
785785

786-
def _omc_docker_start(self) -> Tuple[subprocess.Popen, DummyPopen, str]:
786+
def _docker_omc_start(self) -> Tuple[subprocess.Popen, DummyPopen, str]:
787787
my_env = os.environ.copy()
788788

789789
docker_cid_file = self._temp_dir / (self._omc_filebase + ".docker.cid")
790790

791-
omc_command = self._omc_command_docker(
791+
omc_command = self._docker_omc_cmd(
792792
omc_path_and_args_list=["--locale=C",
793793
"--interactive=zmq",
794794
f"-z={self._random_string}"],
@@ -856,7 +856,7 @@ def __init__(
856856
self._interactivePort = port
857857

858858
# start up omc executable in docker container waiting for the ZMQ connection
859-
self._omc_process, self._docker_process = self._omc_docker_start()
859+
self._omc_process, self._docker_process = self._docker_omc_start()
860860
# connect to the running omc instance using ZMQ
861861
self._omc_port = self._omc_port_get()
862862

@@ -867,7 +867,7 @@ def __del__(self) -> None:
867867
# docker container ID was provided - do NOT kill the docker process!
868868
self._docker_process = None
869869

870-
def _omc_command_docker(self, omc_path_and_args_list) -> list:
870+
def _docker_omc_cmd(self, omc_path_and_args_list) -> list:
871871
"""
872872
Define the command that will be called by the subprocess module.
873873
"""
@@ -891,12 +891,14 @@ def _omc_command_docker(self, omc_path_and_args_list) -> list:
891891

892892
return omc_command
893893

894-
def _omc_docker_start(self) -> Tuple[subprocess.Popen, DummyPopen]:
894+
def _docker_omc_start(self) -> Tuple[subprocess.Popen, DummyPopen]:
895895
my_env = os.environ.copy()
896896

897-
omc_command = self._omc_command_docker(omc_path_and_args_list=["--locale=C",
898-
"--interactive=zmq",
899-
f"-z={self._random_string}"])
897+
omc_command = self._docker_omc_cmd(
898+
omc_path_and_args_list=["--locale=C",
899+
"--interactive=zmq",
900+
f"-z={self._random_string}"],
901+
)
900902

901903
omc_process = subprocess.Popen(omc_command,
902904
stdout=self._omc_loghandle,

0 commit comments

Comments
 (0)