mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge with 3.4

Browse source
This commit is contained in:
Georg Brandl 2014-10-31 13:13:09 +01:00
commit b8fa289152
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/typeobject.c
View file

@ -6280,9 +6280,9 @@ static slotdef slotdefs[] = {
BINSLOT("__truediv__", nb_true_divide, slot_nb_true_divide, "/"), BINSLOT("__truediv__", nb_true_divide, slot_nb_true_divide, "/"),
RBINSLOT("__rtruediv__", nb_true_divide, slot_nb_true_divide, "/"), RBINSLOT("__rtruediv__", nb_true_divide, slot_nb_true_divide, "/"),
IBSLOT("__ifloordiv__", nb_inplace_floor_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, 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, NBSLOT("__index__", nb_index, slot_nb_index, wrap_unaryfunc,
"__index__($self, /)\n--\n\n" "__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 "