more move & rename

Author: syntron

OMPython/OMCSession.py

@@ -373,46 +373,47 @@ def size(self) -> int:
         return path.stat().st_size
 
 
-if sys.version_info < (3, 12):
+class OMPathCompatibility(pathlib.Path):
+    """
+    Compatibility class for OMCPath in Python < 3.12. This allows to run all code which uses OMCPath (mainly
+    ModelicaSystem) on these Python versions. There is one remaining limitation: only OMCProcessLocal will work as
+    OMPathCompatibility is based on the standard pathlib.Path implementation.
+    """
+
+    # modified copy of pathlib.Path.__new__() definition
+    def __new__(cls, *args, **kwargs):
+        logger.warning("Python < 3.12 - using a version of class OMCPath "
+                       "based on pathlib.Path for local usage only.")
 
-    class _OMCPathCompatibility(pathlib.Path):
+        if cls is OMPathCompatibility:
+            cls = OMPathCompatibilityWindows if os.name == 'nt' else OMPathCompatibilityPosix
+        self = cls._from_parts(args)
+        if not self._flavour.is_supported:
+            raise NotImplementedError(f"cannot instantiate {cls.__name__} on your system")
+        return self
+
+    def size(self) -> int:
         """
-        Compatibility class for OMCPath in Python < 3.12. This allows to run all code which uses OMCPath (mainly
-        ModelicaSystem) on these Python versions. There is one remaining limitation: only OMCProcessLocal will work as
-        _OMCPathCompatibility is based on the standard pathlib.Path implementation.
+        Needed compatibility function to have the same interface as OMCPathReal
         """
+        return self.stat().st_size
 
-        # modified copy of pathlib.Path.__new__() definition
-        def __new__(cls, *args, **kwargs):
-            logger.warning("Python < 3.12 - using a version of class OMCPath "
-                           "based on pathlib.Path for local usage only.")
 
-            if cls is _OMCPathCompatibility:
-                cls = _OMCPathCompatibilityWindows if os.name == 'nt' else _OMCPathCompatibilityPosix
-            self = cls._from_parts(args)
-            if not self._flavour.is_supported:
-                raise NotImplementedError(f"cannot instantiate {cls.__name__} on your system")
-            return self
-
-        def size(self) -> int:
-            """
-            Needed compatibility function to have the same interface as OMCPathReal
-            """
-            return self.stat().st_size
+class OMPathCompatibilityPosix(pathlib.PosixPath, OMPathCompatibility):
+    """
+    Compatibility class for OMCPath on Posix systems (Python < 3.12)
+    """
 
-    class _OMCPathCompatibilityPosix(pathlib.PosixPath, _OMCPathCompatibility):
-        """
-        Compatibility class for OMCPath on Posix systems (Python < 3.12)
-        """
 
-    class _OMCPathCompatibilityWindows(pathlib.WindowsPath, _OMCPathCompatibility):
-        """
-        Compatibility class for OMCPath on Windows systems (Python < 3.12)
-        """
+class OMPathCompatibilityWindows(pathlib.WindowsPath, OMPathCompatibility):
+    """
+    Compatibility class for OMCPath on Windows systems (Python < 3.12)
+    """
 
-    OMCPath = _OMCPathCompatibility
-    OMCPathDummy = _OMCPathCompatibility
 
+if sys.version_info < (3, 12):
+    OMCPath = OMPathCompatibility
+    OMCPathDummy = OMPathCompatibility
 else:
     OMCPath = _OMCPath
     OMCPathDummy = _OMPathRunner