INPLACE_DIVIDE is no longer necessary (INPLACE_TRUE_DIVIDE is used).

diff --git a/Doc/lib/libdis.tex b/Doc/lib/libdis.tex
index a5b2c2c54a24da3bf29f4b24617da361c1b39930..19fda5ba9942afebcf92695e2658a9b977fe74e4 100644 (file)
--- a/Doc/lib/libdis.tex
+++ b/Doc/lib/libdis.tex
@@ -247,11 +247,6 @@ Implements in-place \code{TOS = TOS1 ** TOS}.
 Implements in-place \code{TOS = TOS1 * TOS}.
 \end{opcodedesc}
 
-\begin{opcodedesc}{INPLACE_DIVIDE}{}
-Implements in-place \code{TOS = TOS1 / TOS} when
-\code{from __future__ import division} is not in effect.
-\end{opcodedesc}
-
 \begin{opcodedesc}{INPLACE_FLOOR_DIVIDE}{}
 Implements in-place \code{TOS = TOS1 // TOS}.
 \end{opcodedesc}

diff --git a/Include/opcode.h b/Include/opcode.h
index d05588a8d34b4b4adf22a3bc34173c8ebba45b48..e8a7c7f1fa7a672811ef02013668899b1b1f1433 100644 (file)
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -48,7 +48,7 @@ extern "C" {
 #define INPLACE_ADD    55
 #define INPLACE_SUBTRACT       56
 #define INPLACE_MULTIPLY       57
-#define INPLACE_DIVIDE 58
+
 #define INPLACE_MODULO 59
 #define STORE_SUBSCR   60
 #define DELETE_SUBSCR  61

diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py
index e34120ef5d9c3a20cc109da5bf0e4d084027322f..aac2dda7e2244f8571130de9573ba1bf2b168dff 100644 (file)
--- a/Lib/compiler/pycodegen.py
+++ b/Lib/compiler/pycodegen.py
@@ -999,7 +999,7 @@ class CodeGenerator:
         '+=' : 'INPLACE_ADD',
         '-=' : 'INPLACE_SUBTRACT',
         '*=' : 'INPLACE_MULTIPLY',
-        '/=' : 'INPLACE_DIVIDE',
+        '/=' : 'INPLACE_TRUE_DIVIDE',
         '//=': 'INPLACE_FLOOR_DIVIDE',
         '%=' : 'INPLACE_MODULO',
         '**=': 'INPLACE_POWER',

diff --git a/Lib/opcode.py b/Lib/opcode.py
index 2b9212f75b42e55dde15ced6c9a97af5c303ee89..573a7b04be6520df0c6ee35c2358c500f49a522f 100644 (file)
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -88,7 +88,7 @@ def_op('DELETE_SLICE+3', 53)
 def_op('INPLACE_ADD', 55)
 def_op('INPLACE_SUBTRACT', 56)
 def_op('INPLACE_MULTIPLY', 57)
-def_op('INPLACE_DIVIDE', 58)
+
 def_op('INPLACE_MODULO', 59)
 def_op('STORE_SUBSCR', 60)
 def_op('DELETE_SUBSCR', 61)

diff --git a/Python/compile.c b/Python/compile.c
index 9ce2bf795fc10397c36cc296d6c7a0d13350ceaf..b92fb6254148cb69723ee764bc6501aba9febde8 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1338,7 +1338,6 @@ opcode_stack_effect(int opcode, int oparg)
                case INPLACE_ADD:
                case INPLACE_SUBTRACT:
                case INPLACE_MULTIPLY:
-               case INPLACE_DIVIDE:
                case INPLACE_MODULO:
                        return -1;
                case STORE_SUBSCR: