Merged revisions 77314 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r77314 | ezio.melotti | 2010-01-05 10:37:27 +0200 (Tue, 05 Jan 2010) | 1 line

  #7432: remove unnecessary from __future__ import division
........

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 8d4d95616225a5b5e13cf240c2c195d7a825aa61..d0312de7c9c98a251621f29b71d73dc1028cb497 100644 (file)
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -219,8 +219,7 @@ result back on the stack.
 
 .. opcode:: BINARY_TRUE_DIVIDE ()
 
-   Implements ``TOS = TOS1 / TOS`` when ``from __future__ import division`` is in
-   effect.
+   Implements ``TOS = TOS1 / TOS``.
 
 
 .. opcode:: BINARY_MODULO ()
@@ -290,8 +289,7 @@ the original TOS1.
 
 .. opcode:: INPLACE_TRUE_DIVIDE ()
 
-   Implements in-place ``TOS = TOS1 / TOS`` when ``from __future__ import
-   division`` is in effect.
+   Implements in-place ``TOS = TOS1 / TOS``.
 
 
 .. opcode:: INPLACE_MODULO ()