diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 14:20:46 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-17 14:20:46 (GMT) |
| commit | 0dccbe138776715a3778e97b92cc1922f172f3ab (patch) | |
| tree | 4db6360bc8615733dab8dd66a1f1cad2778132aa | |
| parent | 1eff0fc3cd258c12433f28f441028534ff0ee600 (diff) | |
| parent | abfc7df14982617f35a245247a935543639746dc (diff) | |
| download | cpython-0dccbe138776715a3778e97b92cc1922f172f3ab.zip cpython-0dccbe138776715a3778e97b92cc1922f172f3ab.tar.gz cpython-0dccbe138776715a3778e97b92cc1922f172f3ab.tar.bz2 | |
null merge
| -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 0d12126..cd4d02f 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -379,7 +379,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 @@ -570,4 +573,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. - @@ -901,6 +901,7 @@ Hugo van Rossum Saskia van Rossum Donald Wallace Rouse II Liam Routt +Todd Rovito Craig Rowland Clinton Roy Paul Rubin |