commit b8fa2891526dabbc2f37d0243c093f110c84397a
author Georg Brandl <georg@python.org> Fri Oct 31 13:13:09 2014 +0100
committer Georg Brandl <georg@python.org> Fri Oct 31 13:13:09 2014 +0100
tree 20d142a8458b19823dcd2a793b647b37c02b3abc
parent 8f60c0e7f4c6c7f98abcff159a233f5fe3a1a4f2
parent e1d26f377eb911aa6a6c5f666ba9c71c65b85695

merge with 3.4

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 7438ded..574314f 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -6280,9 +6280,9 @@
     BINSLOT("__truediv__", nb_true_divide, slot_nb_true_divide, "/"),
     RBINSLOT("__rtruediv__", nb_true_divide, slot_nb_true_divide, "/"),
     IBSLOT("__ifloordiv__", nb_inplace_floor_divide,
-           slot_nb_inplace_floor_divide, wrap_binaryfunc, "//"),
+           slot_nb_inplace_floor_divide, wrap_binaryfunc, "//="),
     IBSLOT("__itruediv__", nb_inplace_true_divide,
-           slot_nb_inplace_true_divide, wrap_binaryfunc, "/"),
+           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 "