[Python-checkins] r77315 - in python/branches/release31-maint: Doc/library/dis.rst

[ezio.melotti]

Author: ezio.melotti
Date: Tue Jan  5 09:38:30 2010
New Revision: 77315

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/dis.rst

Modified: python/branches/release31-maint/Doc/library/dis.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/dis.rst	(original)
+++ python/branches/release31-maint/Doc/library/dis.rst	Tue Jan  5 09:38:30 2010
@@ -219,8 +219,7 @@
 
 .. 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 @@
 
 .. 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 ()