diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-05-28 21:05:11 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-05-28 21:05:11 (GMT) |
| commit | 6ca426021904b7ec9548b64842eff107b0b8aeb8 (patch) | |
| tree | ab1567524b7368fdedaa8fbccd89cb35aaeb7174 /Objects/typeobject.c | |
| parent | dc4f7c09cc934524a763498250e30123a0d9d2c5 (diff) | |
| parent | c352620c92d2efcdf4940909d6de81cf9c336e0b (diff) | |
| download | cpython-6ca426021904b7ec9548b64842eff107b0b8aeb8.zip cpython-6ca426021904b7ec9548b64842eff107b0b8aeb8.tar.gz cpython-6ca426021904b7ec9548b64842eff107b0b8aeb8.tar.bz2 | |
merge 3.5
Diffstat (limited to 'Objects/typeobject.c')
| -rw-r--r-- | Objects/typeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index f869c8d..a647791 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -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 |