Skip to content

bpo-37369: Fix initialization of sys members when launched via an app container #14428

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
zooba merged 17 commits into from
Jun 29, 2019
Merged

bpo-37369: Fix initialization of sys members when launched via an app container #14428

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ef7b005
[WIP] Attempt to use alternate executable path
zooba Jun 26, 2019
00db87b
[WIP] Finish sys.base_executable changes, improve alias path calculation
zooba Jun 27, 2019
a9163ca
Switch to std::wstring because I'm sick of memory management
zooba Jun 27, 2019
5bf292b
Fix config.base_executable calculations
zooba Jun 27, 2019
adea10b
Fix trailing whitespace
zooba Jun 27, 2019
75ebe6a
Revert base_executable changes in path config
zooba Jun 27, 2019
00c5e83
Restore one that I should have left
zooba Jun 27, 2019
ad6d7d1
Merge remote-tracking branch 'cpython/master' into bpo-37369
zooba Jun 27, 2019
9a744e8
Make sys._base_executable internal again and calculate it properly on…
zooba Jun 27, 2019
b68dc7d
Fix venv test
zooba Jun 27, 2019
d5fcb03
Address feedback and fix venv with symlinks
zooba Jun 28, 2019
5891ad0
Fixes tests that use symlinks
zooba Jun 28, 2019
788d230
Improve check for unlinkable venv
zooba Jun 28, 2019
35c099c
Fix handling of symlinked venvs
zooba Jun 28, 2019
b0db83e
Ensure PYTHONUSERBASE can be overridden
zooba Jun 29, 2019
f44462b
sys._base_executable is now always defined
zooba Jun 29, 2019
07f1750
Add test.support.PythonSymlink to encapsulate platform-specific logic…
zooba Jun 29, 2019
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
9 changes: 5 additions & 4 deletions Include/cpython/initconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,11 @@ typedef struct {
module_search_paths_set is equal
to zero. */

wchar_t *executable; /* sys.executable */
wchar_t *prefix; /* sys.prefix */
wchar_t *base_prefix; /* sys.base_prefix */
wchar_t *exec_prefix; /* sys.exec_prefix */
wchar_t *executable; /* sys.executable */
wchar_t *base_executable; /* sys.base_executable */
Comment thread
zooba marked this conversation as resolved.
Outdated
wchar_t *prefix; /* sys.prefix */
wchar_t *base_prefix; /* sys.base_prefix */
wchar_t *exec_prefix; /* sys.exec_prefix */
wchar_t *base_exec_prefix; /* sys.base_exec_prefix */

/* --- Parameter only used by Py_Main() ---------- */
Expand Down
2 changes: 2 additions & 0 deletions Include/internal/pycore_pathconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ typedef struct _PyPathConfig {
are ignored when their value are equal to -1 (unset). */
int isolated;
int site_import;
/* Set when a venv is detected */
wchar_t *base_executable;
} _PyPathConfig;

#define _PyPathConfig_INIT \
Expand Down
11 changes: 5 additions & 6 deletions Lib/site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,12 @@ def venv(known_paths):
env = os.environ
if sys.platform == 'darwin' and '__PYVENV_LAUNCHER__' in env:
executable = sys._base_executable = os.environ['__PYVENV_LAUNCHER__']
elif sys.platform == 'win32' and '__PYVENV_LAUNCHER__' in env:
elif sys.platform == 'win32':
executable = sys.executable
import _winapi
sys._base_executable = _winapi.GetModuleFileName(0)
# bpo-35873: Clear the environment variable to avoid it being
# inherited by child processes.
del os.environ['__PYVENV_LAUNCHER__']
if '__PYVENV_LAUNCHER__' in env:
# bpo-35873: Clear the environment variable to avoid it being
# inherited by child processes.
del os.environ['__PYVENV_LAUNCHER__']
else:
executable = sys.executable
exe_dir, _ = os.path.split(os.path.abspath(executable))
Expand Down
17 changes: 10 additions & 7 deletions Lib/test/test_embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'pythonpath_env': None,
'home': None,
'executable': GET_DEFAULT_CONFIG,
'base_executable': GET_DEFAULT_CONFIG,

'prefix': GET_DEFAULT_CONFIG,
'base_prefix': GET_DEFAULT_CONFIG,
Expand Down Expand Up @@ -534,14 +535,16 @@ def get_expected_config(self, expected_preconfig, expected, env, api,
if expected['stdio_errors'] is self.GET_DEFAULT_CONFIG:
expected['stdio_errors'] = 'surrogateescape'

if sys.platform == 'win32':
default_executable = self.test_exe
elif expected['program_name'] is not self.GET_DEFAULT_CONFIG:
default_executable = os.path.abspath(expected['program_name'])
else:
default_executable = os.path.join(os.getcwd(), '_testembed')
if expected['executable'] is self.GET_DEFAULT_CONFIG:
if sys.platform == 'win32':
expected['executable'] = self.test_exe
else:
if expected['program_name'] is not self.GET_DEFAULT_CONFIG:
expected['executable'] = os.path.abspath(expected['program_name'])
else:
expected['executable'] = os.path.join(os.getcwd(), '_testembed')
expected['executable'] = default_executable
if expected['base_executable'] is self.GET_DEFAULT_CONFIG:
expected['base_executable'] = default_executable
if expected['program_name'] is self.GET_DEFAULT_CONFIG:
expected['program_name'] = './_testembed'

Expand Down
2 changes: 1 addition & 1 deletion Lib/venv/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def setup_python(self, context):

for suffix in suffixes:
src = os.path.join(dirname, suffix)
if os.path.exists(src):
if os.path.lexists(src):
Comment thread
zooba marked this conversation as resolved.
copier(src, os.path.join(binpath, suffix))

if sysconfig.is_python_build(True):
Expand Down
17 changes: 14 additions & 3 deletions PC/getpathp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,14 +537,25 @@ get_program_full_path(const PyConfig *config,
wchar_t program_full_path[MAXPATHLEN+1];
memset(program_full_path, 0, sizeof(program_full_path));

if (!GetModuleFileNameW(NULL, program_full_path, MAXPATHLEN)) {
/* GetModuleFileName should never fail when passed NULL */
return _PyStatus_ERR("Cannot determine program path");
}

/* The launcher may need to force the executable path to a
* different environment, so override it here. */
pyvenv_launcher = _wgetenv(L"__PYVENV_LAUNCHER__");
if (pyvenv_launcher && pyvenv_launcher[0]) {
/* If overridden, preserve the original full path */
Comment thread
zooba marked this conversation as resolved.
pathconfig->base_executable = PyMem_RawMalloc(
sizeof(wchar_t) * (MAXPATHLEN + 1));

PyStatus status = canonicalize(pathconfig->base_executable,
program_full_path);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
wcscpy_s(program_full_path, MAXPATHLEN+1, pyvenv_launcher);
} else if (!GetModuleFileNameW(NULL, program_full_path, MAXPATHLEN)) {
/* GetModuleFileName should never fail when passed NULL */
return _PyStatus_ERR("Cannot determine program path");
}

pathconfig->program_full_path = PyMem_RawMalloc(
Expand Down
Loading