Kaydet (Commit) 712ce454 authored tarafından Neal Norwitz's avatar Neal Norwitz

_Py_QnewFlag and INPLACE_DIVIDE are not necessary any longer

üst bd2835c6
...@@ -16,10 +16,6 @@ PyAPI_DATA(int) Py_TabcheckFlag; ...@@ -16,10 +16,6 @@ PyAPI_DATA(int) Py_TabcheckFlag;
PyAPI_DATA(int) Py_UnicodeFlag; PyAPI_DATA(int) Py_UnicodeFlag;
PyAPI_DATA(int) Py_IgnoreEnvironmentFlag; PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
PyAPI_DATA(int) Py_DivisionWarningFlag; PyAPI_DATA(int) Py_DivisionWarningFlag;
/* _XXX Py_QnewFlag should go away in 3.0. It's true iff -Qnew is passed,
on the command line, and is used in 2.2 by ceval.c to make all "/" divisions
true divisions (which they will be in 3.0). */
PyAPI_DATA(int) _Py_QnewFlag;
/* this is a wrapper around getenv() that pays attention to /* this is a wrapper around getenv() that pays attention to
Py_IgnoreEnvironmentFlag. It should be used for getting variables like Py_IgnoreEnvironmentFlag. It should be used for getting variables like
......
...@@ -1262,19 +1262,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throw) ...@@ -1262,19 +1262,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throw)
if (x != NULL) continue; if (x != NULL) continue;
break; break;
case INPLACE_DIVIDE:
if (!_Py_QnewFlag) {
w = POP();
v = TOP();
x = PyNumber_InPlaceDivide(v, w);
Py_DECREF(v);
Py_DECREF(w);
SET_TOP(x);
if (x != NULL) continue;
break;
}
/* -Qnew is in effect: fall through to
INPLACE_TRUE_DIVIDE */
case INPLACE_TRUE_DIVIDE: case INPLACE_TRUE_DIVIDE:
w = POP(); w = POP();
v = TOP(); v = TOP();
......
...@@ -71,10 +71,6 @@ int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ ...@@ -71,10 +71,6 @@ int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
int Py_FrozenFlag; /* Needed by getpath.c */ int Py_FrozenFlag; /* Needed by getpath.c */
int Py_UnicodeFlag = 0; /* Needed by compile.c */ int Py_UnicodeFlag = 0; /* Needed by compile.c */
int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */ int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
/* _XXX Py_QnewFlag should go away in 2.3. It's true iff -Qnew is passed,
on the command line, and is used in 2.2 by ceval.c to make all "/" divisions
true divisions (which they will be in 2.3). */
int _Py_QnewFlag = 0;
/* Reference to 'warnings' module, to avoid importing it /* Reference to 'warnings' module, to avoid importing it
on the fly when the import lock may be held. See 683658/771097 on the fly when the import lock may be held. See 683658/771097
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment