[Python-Dev] cpython (merge 3.2 -> 3.2): null merge (original) (raw)
Georg Brandl g.brandl at gmx.net
Sun Oct 28 08:46:16 CET 2012
- Previous message: [Python-Dev] cpython (3.2): bounds check for bad data (thanks amaury)
- Next message: [Python-Dev] devguide: Silence Sphinx warning
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Not very important, but this is not a null merge, as you can see from the diff :)
Georg
Am 17.10.2012 16:33, schrieb andrew.svetlov:
http://hg.python.org/cpython/rev/16493102f9b1 changeset: 79798:16493102f9b1 branch: 3.2 parent: 79791:98f64cbed2ac parent: 79795:a8052ad9752b user: Andrew Svetlov <andrew.svetlov at gmail.com> date: Wed Oct 17 17:20:46 2012 +0300 summary: null merge
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
Python-checkins mailing list Python-checkins at python.org http://mail.python.org/mailman/listinfo/python-checkins
- Previous message: [Python-Dev] cpython (3.2): bounds check for bad data (thanks amaury)
- Next message: [Python-Dev] devguide: Silence Sphinx warning
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]