From 712ce454156496e9bcd32cffde78d1626b102010 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Fri, 17 Mar 2006 08:57:43 +0000 Subject: _Py_QnewFlag and INPLACE_DIVIDE are not necessary any longer --- Include/pydebug.h | 4 ---- Python/ceval.c | 13 ------------- Python/pythonrun.c | 4 ---- 3 files changed, 21 deletions(-) diff --git a/Include/pydebug.h b/Include/pydebug.h index f49a98e..f6c7718 100644 --- a/Include/pydebug.h +++ b/Include/pydebug.h @@ -16,10 +16,6 @@ PyAPI_DATA(int) Py_TabcheckFlag; PyAPI_DATA(int) Py_UnicodeFlag; PyAPI_DATA(int) Py_IgnoreEnvironmentFlag; 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 Py_IgnoreEnvironmentFlag. It should be used for getting variables like diff --git a/Python/ceval.c b/Python/ceval.c index 1a35610..6f76781 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1262,19 +1262,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throw) if (x != NULL) continue; 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: w = POP(); v = TOP(); diff --git a/Python/pythonrun.c b/Python/pythonrun.c index d04d111..2c5400d 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -71,10 +71,6 @@ int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ int Py_FrozenFlag; /* Needed by getpath.c */ int Py_UnicodeFlag = 0; /* Needed by compile.c */ 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 on the fly when the import lock may be held. See 683658/771097 -- cgit v0.12