[OMCSession] move OMCPathRunner* into the if clause

Author: syntron

OMPython/OMCSession.py

@@ -289,6 +289,8 @@ class OMPathCompatibilityWindows(pathlib.WindowsPath, OMPathCompatibility):
 
     OMPathABC = OMPathCompatibility
     OMCPath = OMPathCompatibility
+    OMPathRunnerABC = OMPathCompatibility
+    OMPathRunnerLocal = OMPathCompatibility
 else:
     class OMPathABC(pathlib.PurePosixPath, metaclass=abc.ABCMeta):
         """
@@ -514,7 +516,95 @@ def size(self) -> int:
 
             raise OMCSessionException(f"Error reading file size for path {self.as_posix()}!")
 
+    class OMPathRunnerABC(OMPathABC, metaclass=abc.ABCMeta):
+        """
+        Base function for OMPath definitions *without* OMC server
+        """
+
+        def _path(self) -> pathlib.Path:
+            return pathlib.Path(self.as_posix())
+
+    class _OMPathRunnerLocal(OMPathRunnerABC):
+        """
+        Implementation of OMPathBase which does not use the session data at all. Thus, this implementation can run
+        locally without any usage of OMC.
+
+        This class is based on OMPathBase and, therefore, on pathlib.PurePosixPath. This is working well, but it is not
+        the correct implementation on Windows systems. To get a valid Windows representation of the path, use the
+        conversion via pathlib.Path(<OMCPathDummy>.as_posix()).
+        """
+
+        def is_file(self) -> bool:
+            """
+            Check if the path is a regular file.
+            """
+            return self._path().is_file()
+
+        def is_dir(self) -> bool:
+            """
+            Check if the path is a directory.
+            """
+            return self._path().is_dir()
+
+        def is_absolute(self):
+            """
+            Check if the path is an absolute path.
+            """
+            return self._path().is_absolute()
+
+        def read_text(self) -> str:
+            """
+            Read the content of the file represented by this path as text.
+            """
+            return self._path().read_text(encoding='utf-8')
+
+        def write_text(self, data: str):
+            """
+            Write text data to the file represented by this path.
+            """
+            return self._path().write_text(data=data, encoding='utf-8')
+
+        def mkdir(self, parents: bool = True, exist_ok: bool = False):
+            """
+            Create a directory at the path represented by this class.
+
+            The argument parents with default value True exists to ensure compatibility with the fallback solution for
+            Python < 3.12. In this case, pathlib.Path is used directly and this option ensures, that missing parent
+            directories are also created.
+            """
+            return self._path().mkdir(parents=parents, exist_ok=exist_ok)
+
+        def cwd(self):
+            """
+            Returns the current working directory as an OMPathBase object.
+            """
+            return self._path().cwd()
+
+        def unlink(self, missing_ok: bool = False) -> None:
+            """
+            Unlink (delete) the file or directory represented by this path.
+            """
+            return self._path().unlink(missing_ok=missing_ok)
+
+        def resolve(self, strict: bool = False):
+            """
+            Resolve the path to an absolute path. This is done based on available OMC functions.
+            """
+            path_resolved = self._path().resolve(strict=strict)
+            return type(self)(path_resolved, session=self._session)
+
+        def size(self) -> int:
+            """
+            Get the size of the file in bytes - implementation baseon on pathlib.Path.
+            """
+            if not self.is_file():
+                raise OMCSessionException(f"Path {self.as_posix()} is not a file!")
+
+            path = self._path()
+            return path.stat().st_size
+
     OMCPath = _OMCPath
+    OMPathRunnerLocal = _OMPathRunnerLocal
 
 
 class ModelExecutionException(Exception):
@@ -1737,101 +1827,6 @@ def _omc_port_get(self) -> str:
         return port
 
 
-class OMPathRunnerABC(OMPathABC, metaclass=abc.ABCMeta):
-    """
-    Base function for OMPath definitions *without* OMC server
-    """
-
-    def _path(self) -> pathlib.Path:
-        return pathlib.Path(self.as_posix())
-
-
-class _OMPathRunnerLocal(OMPathRunnerABC):
-    """
-    Implementation of OMPathBase which does not use the session data at all. Thus, this implementation can run locally
-    without any usage of OMC.
-
-    This class is based on OMPathBase and, therefore, on pathlib.PurePosixPath. This is working well, but it is not the
-    correct implementation on Windows systems. To get a valid Windows representation of the path, use the conversion
-    via pathlib.Path(<OMCPathDummy>.as_posix()).
-    """
-
-    def is_file(self) -> bool:
-        """
-        Check if the path is a regular file.
-        """
-        return self._path().is_file()
-
-    def is_dir(self) -> bool:
-        """
-        Check if the path is a directory.
-        """
-        return self._path().is_dir()
-
-    def is_absolute(self):
-        """
-        Check if the path is an absolute path.
-        """
-        return self._path().is_absolute()
-
-    def read_text(self) -> str:
-        """
-        Read the content of the file represented by this path as text.
-        """
-        return self._path().read_text(encoding='utf-8')
-
-    def write_text(self, data: str):
-        """
-        Write text data to the file represented by this path.
-        """
-        return self._path().write_text(data=data, encoding='utf-8')
-
-    def mkdir(self, parents: bool = True, exist_ok: bool = False):
-        """
-        Create a directory at the path represented by this class.
-
-        The argument parents with default value True exists to ensure compatibility with the fallback solution for
-        Python < 3.12. In this case, pathlib.Path is used directly and this option ensures, that missing parent
-        directories are also created.
-        """
-        return self._path().mkdir(parents=parents, exist_ok=exist_ok)
-
-    def cwd(self):
-        """
-        Returns the current working directory as an OMPathBase object.
-        """
-        return self._path().cwd()
-
-    def unlink(self, missing_ok: bool = False) -> None:
-        """
-        Unlink (delete) the file or directory represented by this path.
-        """
-        return self._path().unlink(missing_ok=missing_ok)
-
-    def resolve(self, strict: bool = False):
-        """
-        Resolve the path to an absolute path. This is done based on available OMC functions.
-        """
-        path_resolved = self._path().resolve(strict=strict)
-        return type(self)(path_resolved, session=self._session)
-
-    def size(self) -> int:
-        """
-        Get the size of the file in bytes - implementation baseon on pathlib.Path.
-        """
-        if not self.is_file():
-            raise OMCSessionException(f"Path {self.as_posix()} is not a file!")
-
-        path = self._path()
-        return path.stat().st_size
-
-
-if sys.version_info < (3, 12):
-    OMPathRunnerLocal = OMPathCompatibility
-else:
-    OMPathRunnerLocal = _OMPathRunnerLocal  # OMPathRunnerLocal
-
-
 class OMSessionRunner(OMSessionABC):
     """
     Implementation based on OMSessionABC without any use of an OMC server.