remove osp from config.py

stonebig · stonebig · commit 586d16ba75dc · 2022-11-21T21:34:24.000+01:00
diff --git a/winpython/config.py b/winpython/config.py
@@ -11,14 +11,15 @@
 """
 
 import sys
-import os.path as osp
+# import os.path as osp
 from pathlib import Path
 
 def get_module_path(modname):
     """Return module *modname* base path"""
-    return osp.abspath(
-        osp.dirname(sys.modules[modname].__file__)
-    )
+    #return osp.abspath(
+    #   osp.dirname(sys.modules[modname].__file__)
+    #)    
+    return str(Path(sys.modules[modname].__file__).parent.resolve())
 
 
 def get_module_data_path(
@@ -35,20 +36,21 @@ def get_module_data_path(
         datapath = get_module_path(modname)
         # parentdir = osp.join(datapath, osp.pardir)
         parentdir = str(Path(datapath).parent)
-        if osp.isfile(parentdir):
+        #if osp.isfile(parentdir):
+        if Path(parentdir).is_file():
             # Parent directory is not a directory but the 'library.zip' file:
             # this is either a py2exe or a cx_Freeze distribution
-            datapath = osp.abspath(
+            #datapath = osp.abspath(
                 # osp.join(
                 #     osp.join(parentdir, osp.pardir), modname
                 # )
-                str(Path(parentdir).parent / modname)
-            )
+            #)    
+            datapath = str((Path(parentdir).parent / modname).resolve())
         if relpath is not None:
-            datapath = osp.abspath(
+            #datapath = osp.abspath(
                 # osp.join(datapath, relpath)
-                str(Path(datapath) / relpath)
-            )
+            #)
+            datapath = str((Path(datapath) / relpath).resolve())
         return datapath
 
 
