diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 14:16:45 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 14:16:45 (GMT) |
| commit | 41695b6673c5d32729e4cacf0adc59a6fe7b4cfb (patch) | |
| tree | f11bb165f726d9006658b6c5ea948d77e11118c6 | |
| parent | a3f862e915484a6b42f541d89f8aad081532662e (diff) | |
| parent | 2365f41a0e576ffdc880c9899d0cc5c0eaef97bc (diff) | |
| download | cpython-41695b6673c5d32729e4cacf0adc59a6fe7b4cfb.zip cpython-41695b6673c5d32729e4cacf0adc59a6fe7b4cfb.tar.gz cpython-41695b6673c5d32729e4cacf0adc59a6fe7b4cfb.tar.bz2 | |
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 8864b79..dbe6c47 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 |