[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4 for porting HOWTO tweaks

[brett.cannon]

https://hg.python.org/cpython/rev/d5c9dd8dd5da
changeset:   94779:d5c9dd8dd5da
parent:      94777:28ba862036cc
parent:      94778:b7945565e150
user:        Brett Cannon <brett at python.org>
date:        Fri Feb 27 15:10:38 2015 -0500
summary:
  Merge with 3.4 for porting HOWTO tweaks

files:
  Doc/howto/pyporting.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -169,8 +169,9 @@
    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
 +++++++++++++++++++++++

-- 
Repository URL: https://hg.python.org/cpython