diff options
| author | guido@google.com <guido@google.com> | 2011-03-29 19:09:45 (GMT) |
|---|---|---|
| committer | guido@google.com <guido@google.com> | 2011-03-29 19:09:45 (GMT) |
| commit | 69cfcabae3d72845d44e1078d25072fdbb02072c (patch) | |
| tree | 0aedaa424e8c8f7139567aed7b6980ea59e16c97 /Python/sysmodule.c | |
| parent | 2008a8f8c09b18fbd24e8039553d50a828dd3fb2 (diff) | |
| parent | e6c1eb92675f67d1907bd7ba00c44262c18e93d4 (diff) | |
| download | cpython-69cfcabae3d72845d44e1078d25072fdbb02072c.zip cpython-69cfcabae3d72845d44e1078d25072fdbb02072c.tar.gz cpython-69cfcabae3d72845d44e1078d25072fdbb02072c.tar.bz2 | |
Merge.
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 31c6939..33255ad 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1312,7 +1312,6 @@ static PyTypeObject FlagsType; static PyStructSequence_Field flags_fields[] = { {"debug", "-d"}, - {"division_warning", "-Q"}, {"inspect", "-i"}, {"interactive", "-i"}, {"optimize", "-O or -OO"}, @@ -1336,9 +1335,9 @@ static PyStructSequence_Desc flags_desc = { flags__doc__, /* doc */ flags_fields, /* fields */ #ifdef RISCOS - 13 -#else 12 +#else + 11 #endif }; @@ -1356,7 +1355,6 @@ make_flags(void) PyStructSequence_SET_ITEM(seq, pos++, PyLong_FromLong(flag)) SetFlag(Py_DebugFlag); - SetFlag(Py_DivisionWarningFlag); SetFlag(Py_InspectFlag); SetFlag(Py_InteractiveFlag); SetFlag(Py_OptimizeFlag); |