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

[georg.brandl]

https://hg.python.org/cpython/rev/c95ce9b0a085
changeset:   93325:c95ce9b0a085
parent:      93321:79eb4ab497b1
parent:      93324:147518a95b60
user:        Georg Brandl <georg at python.org>
date:        Fri Oct 31 13:13:09 2014 +0100
summary:
  merge with 3.4

files:
  Objects/typeobject.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- 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 "

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