diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 17:16:19 +0300 |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 17:16:19 +0300 |
| commit | 2365f41a0e576ffdc880c9899d0cc5c0eaef97bc (patch) | |
| tree | 9a5d3057bafa5f20a88bd6dfdbdcb8de753ff03f | |
| parent | 65b4b40e245bd7f9aee4702eed6f448f12921a8a (diff) | |
| parent | abfc7df14982617f35a245247a935543639746dc (diff) | |
| download | cpython-git-2365f41a0e576ffdc880c9899d0cc5c0eaef97bc.tar.gz | |
Merge issue #9583: Document startup option/environment interaction.
Patch by Todd Rovito.
| -rw-r--r-- | Doc/using/cmdline.rst | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 8864b794cb..dbe6c4727b 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Options you shouldn't use Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ if Python was configured with the ``--with-pydebug`` build option. If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - @@ -997,6 +997,7 @@ Hugo van Rossum Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin |