summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-01-05 08:38:30 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-01-05 08:38:30 (GMT)
commit5f7dde18aa3bdad7bd9469b0c15d99e03b9a1790 (patch)
tree5afa17e3fbd957e0e62ce32a363297d31c6b9fc4 /Doc/library
parent6ea2a3deb819d98c620fdec36dc617bd9ab400ca (diff)
downloadcpython-5f7dde18aa3bdad7bd9469b0c15d99e03b9a1790.zip
cpython-5f7dde18aa3bdad7bd9469b0c15d99e03b9a1790.tar.gz
cpython-5f7dde18aa3bdad7bd9469b0c15d99e03b9a1790.tar.bz2
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 ........
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/dis.rst6
1 files changed, 2 insertions, 4 deletions
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 8d4d956..d0312de7 100644
--- 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 ()