diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-09-01 20:33:56 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-09-01 20:33:56 (GMT) |
| commit | e35dc5110f25ab4c43d6d73affc5b212e9be0262 (patch) | |
| tree | 05d5f831b3ade563a0ee538bf0dab0e5803fd95a /Objects/object.c | |
| parent | 5edbaf295e60e0152c3f240ebef6408fa74572c3 (diff) | |
| parent | eff61f6927c94c82b5fc8f0a266340f1e91a363c (diff) | |
| download | cpython-e35dc5110f25ab4c43d6d73affc5b212e9be0262.zip cpython-e35dc5110f25ab4c43d6d73affc5b212e9be0262.tar.gz cpython-e35dc5110f25ab4c43d6d73affc5b212e9be0262.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Objects/object.c b/Objects/object.c index cf49e1b..52acf12 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1558,6 +1558,9 @@ _Py_ReadyTypes(void) if (PyType_Ready(&PyWrapperDescr_Type) < 0) Py_FatalError("Can't initialize wrapper type"); + if (PyType_Ready(&_PyMethodWrapper_Type) < 0) + Py_FatalError("Can't initialize method wrapper type"); + if (PyType_Ready(&PyEllipsis_Type) < 0) Py_FatalError("Can't initialize ellipsis type"); |