Skip to content

Fix the "is dev?" logic in inspect_python_install() #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 15, 2022
Merged

Fix the "is dev?" logic in inspect_python_install() #149

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d6ad91
Factor out _is_dev().
ericsnowcurrently Mar 15, 2022
a980e1d
Improve the "is dev?" logic.
ericsnowcurrently Mar 15, 2022
21b03a8
Use sys._base_executable, if possible.
ericsnowcurrently Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions pyperformance/_pythoninfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,45 @@ def inspect_python_install(python=sys.executable):
MAGIC_NUMBER = _imp.get_magic()


def _is_dev_stdlib(stdlib_dir):
if os.path.basename(stdlib_dir) != 'Lib':
return False
srcdir = os.path.dirname(stdlib_dir)
for filename in [
os.path.join(srcdir, 'Python', 'pylifecycle.c'),
os.path.join(srcdir, 'PCbuild', 'pythoncore.vcxproj'),
]:
if not os.path.exists(filename):
return False
return True


def _is_dev_executable(executable, stdlib_dir):
builddir = os.path.dirname(executable)
if os.path.exists(os.path.join(builddir, 'pybuilddir.txt')):
return True
if os.name == 'nt':
pcbuild = os.path.dirname(os.path.dirname(executable))
if os.path.basename(pcbuild) == 'PCbuild':
srcdir = os.path.dirname(pcbuild)
if os.path.join(srcdir, 'Lib') == stdlib_dir:
return True
return False


def _inspect_python_install(executable, prefix, base_prefix,
platlibdir, stdlib_dir,
version_info, platform, implementation_name,
**_ignored):
is_venv = prefix != base_prefix

if os.path.basename(stdlib_dir) == 'Lib':
base_executable = os.path.join(os.path.dirname(stdlib_dir), 'python')
if not os.path.exists(base_executable):
raise NotImplementedError(base_executable)
if (_is_dev_stdlib(stdlib_dir) and
_is_dev_executable(executable, stdlib_dir)):
# XXX What about venv?
try:
base_executable = sys._base_executable
except AttributeError:
base_executable = executable
is_dev = True
else:
major, minor = version_info[:2]
Expand Down Expand Up @@ -162,5 +191,7 @@ def _get_raw_info():

if __name__ == '__main__':
info = _get_raw_info()
(info['_base_executable'], info['_is_dev'], info['_is_venv'],
) = _inspect_python_install(**info)
json.dump(info, sys.stdout, indent=4)
print()