comparison Python/pythonrun.c @ 46708:74b9c85361f8

Merged revisions 62774-62775,62785,62787-62788 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62774 | georg.brandl | 2008-05-06 19:11:42 +0200 (Tue, 06 May 2008) | 2 lines #2773: fix description of 'g' and 'G' formatting spec. ........ r62775 | georg.brandl | 2008-05-06 19:20:54 +0200 (Tue, 06 May 2008) | 2 lines > != (!<). ........ r62785 | benjamin.peterson | 2008-05-07 00:18:11 +0200 (Wed, 07 May 2008) | 2 lines Fix logic error in Python/_warnings.c and add a test to verify ........ r62787 | benjamin.peterson | 2008-05-07 00:31:52 +0200 (Wed, 07 May 2008) | 2 lines Make the Python implementation of warnings compatible with the C implementation regarding non-callable showwarning ........ r62788 | christian.heimes | 2008-05-07 00:41:46 +0200 (Wed, 07 May 2008) | 1 line Implemented PEP 370 ........
author Christian Heimes <christian@cheimes.de>
date Tue, 06 May 2008 23:45:46 +0000
parents cda816c3a1e4
children 0c7142c56d7e
comparison
equal deleted inserted replaced
46705:7c80bac7d776 46708:74b9c85361f8
81 int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */ 81 int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
82 int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */ 82 int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
83 int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ 83 int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
84 int Py_FrozenFlag; /* Needed by getpath.c */ 84 int Py_FrozenFlag; /* Needed by getpath.c */
85 int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */ 85 int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
86 int Py_NoUserSiteDirectory = 0; /* for -s and site.py */
86 87
87 /* PyModule_GetWarningsModule is no longer necessary as of 2.6 88 /* PyModule_GetWarningsModule is no longer necessary as of 2.6
88 since _warnings is builtin. This API should not be used. */ 89 since _warnings is builtin. This API should not be used. */
89 PyObject * 90 PyObject *
90 PyModule_GetWarningsModule(void) 91 PyModule_GetWarningsModule(void)