mirror of
https://github.com/python/cpython.git
synced 2025-07-12 05:45:15 +00:00
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 ........
This commit is contained in:
parent
1bf7108fd5
commit
8dc226fccd
13 changed files with 458 additions and 74 deletions
|
@ -1097,7 +1097,7 @@ static PyStructSequence_Field flags_fields[] = {
|
|||
{"interactive", "-i"},
|
||||
{"optimize", "-O or -OO"},
|
||||
{"dont_write_bytecode", "-B"},
|
||||
/* {"no_user_site", "-s"}, */
|
||||
{"no_user_site", "-s"},
|
||||
{"no_site", "-S"},
|
||||
{"ignore_environment", "-E"},
|
||||
{"tabcheck", "-t or -tt"},
|
||||
|
@ -1116,9 +1116,9 @@ static PyStructSequence_Desc flags_desc = {
|
|||
flags__doc__, /* doc */
|
||||
flags_fields, /* fields */
|
||||
#ifdef RISCOS
|
||||
11
|
||||
12
|
||||
#else
|
||||
10
|
||||
11
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -1141,7 +1141,7 @@ make_flags(void)
|
|||
SetFlag(Py_InteractiveFlag);
|
||||
SetFlag(Py_OptimizeFlag);
|
||||
SetFlag(Py_DontWriteBytecodeFlag);
|
||||
/* SetFlag(Py_NoUserSiteDirectory); */
|
||||
SetFlag(Py_NoUserSiteDirectory);
|
||||
SetFlag(Py_NoSiteFlag);
|
||||
SetFlag(Py_IgnoreEnvironmentFlag);
|
||||
SetFlag(Py_TabcheckFlag);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue