merge 3.5

This commit is contained in:
Benjamin Peterson 2016-05-28 14:05:11 -07:00
commit 6ca4260219
3 changed files with 3 additions and 10 deletions

View file

@ -6790,7 +6790,7 @@ update_one_slot(PyTypeObject *type, slotdef *p)
sanity checks and constructing a new argument
list. Cut all that nonsense short -- this speeds
up instance creation tremendously. */
specific = (void *)((PyTypeObject *)PyCFunction_GET_SELF(descr))->tp_new;
specific = (void *)type->tp_new;
/* XXX I'm not 100% sure that there isn't a hole
in this reasoning that requires additional
sanity checks. I'll buy the first person to