[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

benjamin.peterson python-checkins at python.org
Tue Apr 8 16:45:09 CEST 2014


http://hg.python.org/cpython/rev/b1ac067c984f
changeset:   90174:b1ac067c984f
parent:      90171:cb632988bc09
parent:      90172:96a3c9a4287f
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Apr 08 10:44:50 2014 -0400
summary:
  merge 3.4

files:
  Doc/c-api/typeobj.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1199,7 +1199,8 @@
 
    This function is used by :c:func:`PySequence_Repeat` and has the same
    signature.  It is also used by the ``*`` operator, after trying numeric
-   multiplication via the :c:member:`~PyTypeObject.tp_as_number.nb_mul` slot.
+   multiplication via the :c:member:`~PyTypeObject.tp_as_number.nb_multiply`
+   slot.
 
 .. c:member:: ssizeargfunc PySequenceMethods.sq_item
 

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


More information about the Python-checkins mailing list