??? basic updates - must redo it! (changes not included!)

Author: syntron

OMPython/ModelicaSystem.py

@@ -43,7 +43,6 @@
 import textwrap
 import threading
 from typing import Any, cast, Optional
-import warnings
 import xml.etree.ElementTree as ET
 
 import numpy as np
@@ -732,7 +731,7 @@ def getContinuous(
                 try:
                     value = self.getSolutions(name)
                     self._continuous[name] = value[0][-1]
-                except (OMCSessionException, ModelicaSystemError) as ex:
+                except (OMCProcessException, ModelicaSystemError) as ex:
                     raise ModelicaSystemError(f"{name} could not be computed") from ex
             return self._continuous
 

OMPython/OMCSession.py

@@ -321,7 +321,7 @@ def is_absolute(self):
         Check if the path is an absolute path considering the possibility that we are running locally on Windows. This
         case needs special handling as the definition of is_absolute() differs.
         """
-        if isinstance(self._session, OMCProcessLocal) and platform.system() == 'Windows':
+        if isinstance(self._omc_process, OMCProcessLocal) and platform.system() == 'Windows':
             return pathlib.PureWindowsPath(self.as_posix()).is_absolute()
         return super().is_absolute()
 
@@ -344,8 +344,8 @@ def write_text(self, data: str, encoding=None, errors=None, newline=None):
         if not isinstance(data, str):
             raise TypeError(f"data must be str, not {data.__class__.__name__}")
 
-        data_omc = self._session.escape_str(data)
-        self._session.sendExpression(f'writeFile("{self.as_posix()}", "{data_omc}", false);')
+        data_omc = self._omc_process.escape_str(data)
+        self._omc_process.sendExpression(f'writeFile("{self.as_posix()}", "{data_omc}", false);')
 
         return len(data)
 
@@ -384,15 +384,15 @@ def resolve(self, strict: bool = False):
 
         if self.is_file():
             pathstr_resolved = self._omc_resolve(self.parent.as_posix())
-            omcpath_resolved = self._session.omcpath(pathstr_resolved) / self.name
+            omcpath_resolved = self._omc_process.omcpath(pathstr_resolved) / self.name
         elif self.is_dir():
             pathstr_resolved = self._omc_resolve(self.as_posix())
-            omcpath_resolved = self._session.omcpath(pathstr_resolved)
+            omcpath_resolved = self._omc_process.omcpath(pathstr_resolved)
         else:
             raise OMCProcessException(f"Path {self.as_posix()} is neither a file nor a directory!")
 
         if not omcpath_resolved.is_file() and not omcpath_resolved.is_dir():
-            raise OMCSessionException(f"OMCPath resolve failed for {self.as_posix()} - path does not exist!")
+            raise OMCProcessException(f"OMCPath resolve failed for {self.as_posix()} - path does not exist!")
 
         return omcpath_resolved
 
@@ -735,7 +735,7 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
         Caller should only check for OMCSessionException.
         """
 
-        # TODO: this is needed if the class is not fully inititialised or in the process of deletion
+        # TODO: this is needed if the class is not fully initialized or in the process of deletion
         if hasattr(self, '_timeout'):
             timeout = self._timeout
         else:
@@ -770,7 +770,7 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
         result = self._omc_zmq.recv_string()
 
         if result.startswith('Error occurred building AST'):
-            raise OMCSessionException(f"OMC error: {result}")
+            raise OMCProcessException(f"OMC error: {result}")
 
         if command == "getErrorString()":
             # no error handling if 'getErrorString()' is called