Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-90844: Allow virtual environments to correctly launch when they have spaces in the path (GH-94903)

This commit is contained in:
Steve Dower 2022-07-16 17:38:36 +01:00 committed by GitHub
parent 16b6e14cc2
commit 4b4439daed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst Normal file
View File

@ -0,0 +1,2 @@
Allow virtual environments to correctly launch when they have spaces in the
path.

16
PC/launcher.c
View File

@ -1926,27 +1926,35 @@ process(int argc, wchar_t ** argv)
if (!cch) {
error(0, L"Cannot determine memory for home path");
}
cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 1 + 1; /* include sep and null */
cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 4; /* include sep, null and quotes */
executable = (wchar_t *)malloc(cch * sizeof(wchar_t));
if (executable == NULL) {
error(RC_NO_MEMORY, L"A memory allocation failed");
}
cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, executable, cch);
/* start with a quote - we'll skip this ahead, but want it for the final string */
executable[0] = L'"';
cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, &executable[1], cch - 1);
if (!cch_actual) {
error(RC_BAD_VENV_CFG, L"Cannot decode home path in '%ls'",
venv_cfg_path);
}
cch_actual += 1; /* account for the first quote */
executable[cch_actual] = L'\0';
if (executable[cch_actual - 1] != L'\\') {
executable[cch_actual++] = L'\\';
executable[cch_actual] = L'\0';
}
if (wcscat_s(executable, cch, PYTHON_EXECUTABLE)) {
if (wcscat_s(&executable[1], cch - 1, PYTHON_EXECUTABLE)) {
error(RC_BAD_VENV_CFG, L"Cannot create executable path from '%ls'",
venv_cfg_path);
}
if (GetFileAttributesW(executable) == INVALID_FILE_ATTRIBUTES) {
/* there's no trailing quote, so we only have to skip one character for the test */
if (GetFileAttributesW(&executable[1]) == INVALID_FILE_ATTRIBUTES) {
error(RC_NO_PYTHON, L"No Python at '%ls'", executable);
}
/* now append the final quote */
wcscat_s(executable, cch, L"\"");
/* smuggle our original path through */
if (!SetEnvironmentVariableW(L"__PYVENV_LAUNCHER__", argv0)) {
error(0, L"Failed to set launcher environment");
}