Skip to content

[3.9] bpo-37556 Extend help to include latest overrides (GH-14701) #20846

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
miss-islington merged 1 commit into from
Jun 15, 2020
Merged

[3.9] bpo-37556 Extend help to include latest overrides (GH-14701) #20846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2019-07-11-06-11-09.bpo-37556.sygMUU.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Extend py.exe help to mention overrides via venv, shebang, environmental variables & ini files.
11 changes: 10 additions & 1 deletion PC/launcher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ show_help_text(wchar_t ** argv)
Python Launcher for Windows Version %ls\n\n", version_text);
fwprintf(stdout, L"\
usage:\n\
%ls [launcher-args] [python-args] script [script-args]\n\n", argv[0]);
%ls [launcher-args] [python-args] [script [script-args]]\n\n", argv[0]);
fputws(L"\
Launcher arguments:\n\n\
-2 : Launch the latest Python 2.x version\n\
Expand All @@ -1536,6 +1536,15 @@ Launcher arguments:\n\n\
}
fputws(L"\n-0 --list : List the available pythons", stdout);
fputws(L"\n-0p --list-paths : List with paths", stdout);
fputws(L"\n\n If no script is specified the specified interpreter is opened.", stdout);
fputws(L"\nIf an exact version is not given, using the latest version can be overridden by", stdout);
fputws(L"\nany of the following, (in priority order):", stdout);
fputws(L"\n An active virtual environment", stdout);
fputws(L"\n A shebang line in the script (if present)", stdout);
fputws(L"\n With -2 or -3 flag a matching PY_PYTHON2 or PY_PYTHON3 Enviroment variable", stdout);
fputws(L"\n A PY_PYTHON Enviroment variable", stdout);
fputws(L"\n From [defaults] in py.ini in your %LOCALAPPDATA%\\py.ini", stdout);
fputws(L"\n From [defaults] in py.ini beside py.exe (use `where py` to locate)", stdout);
fputws(L"\n\nThe following help text is from Python:\n\n", stdout);
fflush(stdout);
}
Expand Down