[Python-checkins] r43109 - in python/branches/p3yk: Include/pydebug.h Python/ceval.c Python/pythonrun.c

[neal.norwitz]

Author: neal.norwitz
Date: Fri Mar 17 09:57:43 2006
New Revision: 43109

Modified:
   python/branches/p3yk/Include/pydebug.h
   python/branches/p3yk/Python/ceval.c
   python/branches/p3yk/Python/pythonrun.c
Log:
_Py_QnewFlag and INPLACE_DIVIDE are not necessary any longer

Modified: python/branches/p3yk/Include/pydebug.h
==============================================================================
--- python/branches/p3yk/Include/pydebug.h	(original)
+++ python/branches/p3yk/Include/pydebug.h	Fri Mar 17 09:57:43 2006
@@ -16,10 +16,6 @@
 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

Modified: python/branches/p3yk/Python/ceval.c
==============================================================================
--- python/branches/p3yk/Python/ceval.c	(original)
+++ python/branches/p3yk/Python/ceval.c	Fri Mar 17 09:57:43 2006
@@ -1262,19 +1262,6 @@
 			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();

Modified: python/branches/p3yk/Python/pythonrun.c
==============================================================================
--- python/branches/p3yk/Python/pythonrun.c	(original)
+++ python/branches/p3yk/Python/pythonrun.c	Fri Mar 17 09:57:43 2006
@@ -71,10 +71,6 @@
 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