Skip to content

Commit 13db443

Browse files
committed
Merge remote-tracking branch 'origin/corrai_adaptations' into corrai_adaptations
2 parents 6c5751f + de016cf commit 13db443

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

modelitool/simulate.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,11 @@ def _strip_tz(x):
196196
return x.replace(tzinfo=None) if x.tzinfo is not None else x
197197
return x
198198

199-
start_tz = start.tz if isinstance(start, pd.Timestamp) \
199+
start_tz = (
200+
start.tz
201+
if isinstance(start, pd.Timestamp)
200202
else getattr(start, "tzinfo", None)
203+
)
201204

202205
start = _strip_tz(start)
203206
stop = _strip_tz(stop)
@@ -356,7 +359,7 @@ def load_library(lib_path):
356359
lib_name = lib_path.stem
357360

358361
omc.sendExpression(f'setModelicaPath("{modelica_path}")')
359-
success = omc.sendExpression(f'loadModel({lib_name})')
362+
success = omc.sendExpression(f"loadModel({lib_name})")
360363

361364
if not success:
362365
err = omc.sendExpression("getErrorString()")

0 commit comments

Comments
 (0)