From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 18 Apr 2014 14:23:35 +0000 (-0500)
Subject: Merge typo fix from 3.4
X-Git-Tag: v3.5.0a1~1828
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9996a7d21b9635bcd4757be03fc40615c177ef70;p=thirdparty%2FPython%2Fcpython.git

Merge typo fix from 3.4
---

9996a7d21b9635bcd4757be03fc40615c177ef70
diff --cc Objects/typeobject.c
index 6399115f2f74,7f59d5da4050..be9747a166cc
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@@ -6280,14 -6276,8 +6280,14 @@@ static slotdef slotdefs[] = 
             slot_nb_inplace_true_divide, wrap_binaryfunc, "/"),
      NBSLOT("__index__", nb_index, slot_nb_index, wrap_unaryfunc,
             "__index__($self, /)\n--\n\n"
-            "Return self converted to an integer, if self is suitable"
+            "Return self converted to an integer, if self is suitable "
             "for use as an index into a list."),
 +    BINSLOT("__matmul__", nb_matrix_multiply, slot_nb_matrix_multiply,
 +            "@"),
 +    RBINSLOT("__rmatmul__", nb_matrix_multiply, slot_nb_matrix_multiply,
 +             "@"),
 +    IBSLOT("__imatmul__", nb_inplace_matrix_multiply, slot_nb_inplace_matrix_multiply,
 +           wrap_binaryfunc, "@="),
      MPSLOT("__len__", mp_length, slot_mp_length, wrap_lenfunc,
             "__len__($self, /)\n--\n\nReturn len(self)."),
      MPSLOT("__getitem__", mp_subscript, slot_mp_subscript,