10000 PyPy-3.8 normalization · blog2i2j/winpython.._..winpython@e2f85c6 · GitHub
[go: up one dir, main page]

Skip to content

Commit e2f85c6

Browse files
committed
PyPy-3.8 normalization
1 parent 28cfd45 commit e2f85c6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

winpython/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '4.4.20210812'
31+
__version__ = '4.5.20210912'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

winpython/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ def get_python_executable(path = None):
3535
my_path = my_path if osp.isdir(my_path) else osp.dirname(my_path)
3636
exec_py = os.path.join(path, 'python.exe')
3737
exec_pypy = os.path.join(path, 'pypy3.exe') # PyPy !
38-
python_executable = exec_pypy if osp.isfile(exec_pypy) else exec_py
38+
# PyPy >=7.3.6 3.8 aligns to python.exe and Lib\site-packages
39+
#python_executable = exec_pypy if osp.isfile(exec_pypy) else exec_py
40+
python_executable = exec_py if osp.isfile(exec_py) else exec_pypy
3941
return python_executable
4042

4143
def get_site_packages_path(path = None):
@@ -368,6 +370,8 @@ def get_pandoc_version(path):
368370
def python_query(cmd, path):
369371
"""Execute Python command using the Python interpreter located in *path*"""
370372
the_exe = get_python_executable(path)
373+
# debug2021-09-12
374+
print('%s -c "%s"' % (the_exe, cmd), ' * ', path)
371375
return exec_shell_cmd('%s -c "%s"' % (the_exe, cmd), path).splitlines()[0]
372376

373377
def python_execmodule(cmd, path):

0 commit comments

Comments
 (0)
0