[Python-checkins] cpython (3.2): Issue #9583: Document startup option/environment interaction.
andrew.svetlov
python-checkins at python.org
Wed Oct 17 16:33:43 CEST 2012
http://hg.python.org/cpython/rev/a8052ad9752b
changeset: 79795:a8052ad9752b
branch: 3.2
parent: 79788:a0fba0382ae0
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Wed Oct 17 17:15:43 2012 +0300
summary:
Issue #9583: Document startup option/environment interaction.
Patch by Todd Rovito.
files:
Doc/using/cmdline.rst | 6 ++++--
Misc/ACKS | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -379,7 +379,10 @@
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
@@ -570,4 +573,3 @@
If set, Python will print memory allocation statistics every time a new
object arena is created, and on shutdown.
-
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -901,6 +901,7 @@
Saskia van Rossum
Donald Wallace Rouse II
Liam Routt
+Todd Rovito
Craig Rowland
Clinton Roy
Paul Rubin
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list