pathlib and f-string the code

stonebig · stonebig · commit bf0ecbfba9c0 · 2022-10-28T21:26:50.000+02:00
diff --git a/make.py b/make.py
@@ -14,6 +14,7 @@
 
 import os
 import os.path as osp
+from pathlib import Path
 import re
 import subprocess
 import shutil
@@ -41,7 +42,8 @@ def get_drives():
 
 def get_nsis_exe():
     """Return NSIS executable"""
-    localdir = osp.join(sys.prefix, os.pardir, os.pardir)
+    # localdir = osp.join(sys.prefix, os.pardir, os.pardir)
+    localdir = str(Path(sys.prefix).parent.parent)
     for drive in get_drives():
         for dirname in (
             r'C:\Program Files',
@@ -71,7 +73,8 @@ def get_nsis_exe():
 
 def get_iscc_exe():
     """Return ISCC executable"""
-    localdir = osp.join(sys.prefix, os.pardir, os.pardir)
+    # localdir = osp.join(sys.prefix, os.pardir, os.pardir)
+    localdir = str(Path(sys.prefix).parent.parent)
     for drive in get_drives():
         for dirname in (
             r'C:\Program Files',
@@ -101,7 +104,8 @@ def get_iscc_exe():
 
 def get_7zip_exe():
     """Return 7zip executable"""
-    localdir = osp.join(sys.prefix, os.pardir, os.pardir)
+    # localdir = osp.join(sys.prefix, os.pardir, os.pardir)
+    localdir = str(Path(sys.prefix).parent.parent)
     for drive in get_drives():
         for dirname in (
             r'C:\Program Files',
@@ -2198,16 +2202,20 @@ def make(
             self.python_fullversion,
             self.build_number,
         )
-        fname = osp.join(
-            self.winpydir,
-            os.pardir,
-            'WinPython%s-%sbit-%s.md'
-            % (
-                self.flavor,
-                self.distribution.architecture,
-                self.winpyver2,
-            ),
-        )
+        #fname = osp.join(
+        #    self.winpydir,
+        #    os.pardir,
+        #    'WinPython%s-%sbit-%s.md'
+        #    % (
+        #        self.flavor,
+        #        self.distribution.architecture,
+        #        self.winpyver2,
+        #    ),
+        #)
+        fname = str(Path(self.winpydir).parent / (
+                f'WinPython{self.flavor}-' +
+                f'-{self.distribution.architecture}bit-'+
+                f'{self.winpyver2}.md'))   
         open(fname, 'w').write(self.package_index_wiki)
         # Copy to winpython/changelogs
         shutil.copyfile(
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -14,6 +14,7 @@
 
 import os
 import os.path as osp
+from pathlib import Path
 import shutil
 import re
 import sys
@@ -793,13 +794,14 @@ def install_script(self, script, install_options=None):
 
 def main(test=False):
     if test:
-        sbdir = osp.join(
-            osp.dirname(__file__),
-            os.pardir,
-            os.pardir,
-            os.pardir,
-            'sandbox',
-        )
+        #sbdir = osp.join(
+        #    osp.dirname(__file__),
+        #    os.pardir,
+        #    os.pardir,
+        #    os.pardir,
+        #    'sandbox',
+        #)
+        sbdir = str(Path(__file__).parents[0].parent.parent.parent / 'sandbox')
         tmpdir = osp.join(sbdir, 'tobedeleted')
 
         # fname = osp.join(tmpdir, 'scipy-0.10.1.win-amd64-py2.7.exe')
