Merge pull request #1013 from stonebig/master

stonebig · web-flow · commit e735b5a219a6 · 2021-09-18T11:25:39.000+02:00
tweak PyPy-3.7 launchers
diff --git a/make.py b/make.py
@@ -1009,7 +1009,8 @@ def _create_batch_scripts_initial(self):
                (r'DIR%\python.exe' , r'DIR%' + "\\" + shorty),  
                (r'DIR%\PYTHON.EXE' , r'DIR%' + "\\" + shorty),  
                 )
-        if shorty == 'pypy3.exe':
+        if osp.isdir(osp.join(self.distribution.target,
+                               r'lib-python\3\idlelib')):
             changes += ((r'\Lib\idlelib' , r'\lib-python\3\idlelib'),)
         self.create_batch_script(
             'env.bat',
@@ -1477,7 +1478,8 @@ def _create_batch_scripts(self):
                (r'DIR%\python.exe' , r'DIR%' + "\\" + shorty),  
                (r'DIR%\PYTHON.EXE' , r'DIR%' + "\\" + shorty),  
                 )
-        if shorty == 'pypy3.exe':
+        if osp.isdir(osp.join(self.distribution.target,
+                               r'lib-python\3\idlelib')):
             changes += ((r'\Lib\idlelib' , r'\lib-python\3\idlelib'),)
 
         
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '4.5.20210912'
+__version__ = '4.5.20210918'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -33,8 +33,8 @@ def get_python_executable(path = None):
     """return the python executable"""
     my_path = sys.executable if path == None else path  # default = current one
     my_path = my_path if osp.isdir(my_path) else osp.dirname(my_path)
-    exec_py = os.path.join(path, 'python.exe')
-    exec_pypy = os.path.join(path, 'pypy3.exe')  # PyPy !
+    exec_py = os.path.join(my_path, 'python.exe')
+    exec_pypy = os.path.join(my_path, 'pypy3.exe')  # PyPy !
     # PyPy >=7.3.6 3.8 aligns to python.exe and Lib\site-packages
     #python_executable = exec_pypy if osp.isfile(exec_pypy) else exec_py
     python_executable = exec_py if osp.isfile(exec_py) else exec_pypy
@@ -44,8 +44,8 @@ def get_site_packages_path(path = None):
     """return the python site-packages"""
     my_path = sys.executable if path == None else path  # default = current one
     my_path = my_path if osp.isdir(my_path) else osp.dirname(my_path)
-    site_py = os.path.join(path, 'Lib', 'site-packages')
-    site_pypy = os.path.join(path, 'site-packages')  # PyPy !!
+    site_py = os.path.join(my_path, 'Lib', 'site-packages')
+    site_pypy = os.path.join(my_path, 'site-packages')  # PyPy !!
     site_packages_path = site_pypy if osp.isfile(site_pypy) else site_py
     return site_packages_path
 
