summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2015-02-27 20:10:38 (GMT)
committerBrett Cannon <brett@python.org>2015-02-27 20:10:38 (GMT)
commitb44ed82b81944f405d7e3e9974e7baf2456a9eee (patch)
tree43cd75e46a75d8e4dfab4169af6ef5996dd9856c /Doc/howto
parent2f710b60084cdfc37513b169af425e98d950302b (diff)
parentfdde79dbf6ae6d1d3b15770a2e87a5108197d826 (diff)
downloadcpython-b44ed82b81944f405d7e3e9974e7baf2456a9eee.zip
cpython-b44ed82b81944f405d7e3e9974e7baf2456a9eee.tar.gz
cpython-b44ed82b81944f405d7e3e9974e7baf2456a9eee.tar.bz2
Merge with 3.4 for porting HOWTO tweaks
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/pyporting.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
index bd80dfd..d2cd9de 100644
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -169,8 +169,9 @@ things:
division or continue using ``/`` and expect a float
The reason that ``/`` isn't simply translated to ``//`` automatically is that if
-an object defines its own ``__div__`` method but not ``__floordiv__`` then your
-code would begin to fail.
+an object defines a ``__truediv__`` method but not ``__floordiv__`` then your
+code would begin to fail (e.g. a user-defined class that uses ``/`` to
+signify some operation but not ``//`` for the same thing or at all).
Text versus binary data
+++++++++++++++++++++++