From: Georg Brandl <georg@python.org>
Date: Tue, 21 Feb 2012 21:37:36 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42ae472798d4be46038ea7769ee4cabbcc0e3be0;p=thirdparty%2FPython%2Fcpython.git

merge with 3.2
---

42ae472798d4be46038ea7769ee4cabbcc0e3be0
diff --cc Modules/main.c
index 8241ee48fcd6,1282f4697be0..6eb05e96e347
--- a/Modules/main.c
+++ b/Modules/main.c
@@@ -100,14 -102,13 +100,14 @@@ static char *usage_5 
  "PYTHONHOME   : alternate <prefix> directory (or <prefix>%c<exec_prefix>).\n"
  "               The default module search path uses %s.\n"
  "PYTHONCASEOK : ignore case in 'import' statements (Windows).\n"
 -"PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\
 +"PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n"
 +"PYTHONFAULTHANDLER: dump the Python traceback on fatal errors.\n\
  ";
  static char *usage_6 = "\
- PYTHONHASHSEED: if this variable is set to ``random``, a random value is used\n\
 -PYTHONHASHSEED: if this variable is set to 'random', the effect is the same\n\
 -   as specifying the -R option: a random value is used to seed the hashes of\n\
 -   str, bytes and datetime objects.  It can also be set to an integer\n\
 -   in the range [0,4294967295] to get hash values with a predictable seed.\n\
++PYTHONHASHSEED: if this variable is set to 'random', a random value is used\n\
 +   to seed the hashes of str, bytes and datetime objects.  It can also be\n\
 +   set to an integer in the range [0,4294967295] to get hash values with a\n\
 +   predictable seed.\n\
  ";
  
  static int