diff options
| author | Georg Brandl <georg@python.org> | 2014-10-31 12:13:09 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-31 12:13:09 (GMT) |
| commit | b8fa2891526dabbc2f37d0243c093f110c84397a (patch) | |
| tree | 20d142a8458b19823dcd2a793b647b37c02b3abc /Objects | |
| parent | 8f60c0e7f4c6c7f98abcff159a233f5fe3a1a4f2 (diff) | |
| parent | e1d26f377eb911aa6a6c5f666ba9c71c65b85695 (diff) | |
| download | cpython-b8fa2891526dabbc2f37d0243c093f110c84397a.zip cpython-b8fa2891526dabbc2f37d0243c093f110c84397a.tar.gz cpython-b8fa2891526dabbc2f37d0243c093f110c84397a.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ static slotdef slotdefs[] = { 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 " |