Skip to content

Commit 18142a1

Browse files
committed
Merge branch 'master' into refactor-f-strings
2 parents 34d84b5 + bfb1153 commit 18142a1

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

OMPython/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def __del__(self):
163163
self._omc_process.wait(timeout=2.0)
164164
except Exception:
165165
if self._omc_process:
166-
print("OMC did not exit after being sent the quit() command; killing the process with pid={self._omc_process.pid}")
166+
logger.warning("OMC did not exit after being sent the quit() command; killing the process with pid=%s", self._omc_process.pid)
167167
if sys.platform != "win32":
168168
os.killpg(os.getpgid(self._omc_process.pid), signal.SIGTERM)
169169
self._omc_process.kill()
@@ -783,7 +783,7 @@ def _run_cmd(self, cmd: list):
783783
# set the process environment from the generated .bat file in windows which should have all the dependencies
784784
batFilePath = pathlib.Path(self.tempdir) / f"{self.modelName}.bat"
785785
if not batFilePath.exists():
786-
logger.error("Error: bat does not exist %s", batFilePath)
786+
ModelicaSystemError("Batch file (*.bat) does not exist " + batFilePath)
787787

788788
with open(batFilePath, 'r') as file:
789789
for line in file:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ communicate with OpenModelica.
88

99
## Dependencies
1010

11-
- Python 2.7 and 3.x supported
11+
- Python 3.x supported
1212
- PyZMQ is required
1313

1414
## Installation

0 commit comments

Comments
 (0)