From: Georg Brandl <georg@python.org>
Date: Sun, 15 May 2011 06:49:29 +0000 (+0200)
Subject: Merge #6498 fix from 3.1.
X-Git-Tag: v3.3.0a1~2269^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=318e62153baf1162130fb85e06caf64bbd5a7916;p=thirdparty%2FPython%2Fcpython.git

Merge #6498 fix from 3.1.
---

318e62153baf1162130fb85e06caf64bbd5a7916
diff --cc Python/pythonrun.c
index 1e2dd586b471,c4ae9211ffa1..084db12f635e
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@@ -78,9 -81,8 +78,9 @@@ extern void _PyGILState_Fini(void)
  
  int Py_DebugFlag; /* Needed by parser.c */
  int Py_VerboseFlag; /* Needed by import.c */
 +int Py_QuietFlag; /* Needed by sysmodule.c */
  int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
- int Py_InspectFlag; /* Needed to determine whether to exit at SystemError */
+ int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
  int Py_NoSiteFlag; /* Suppress 'import site' */
  int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
  int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */