diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-10-31 03:27:52 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-10-31 03:27:52 (GMT) |
| commit | e8ea97fffb591cd71090d0f3114bf1d3bcd31454 (patch) | |
| tree | 3710073dcda7cfa947f97676c4edd305bb38952f | |
| parent | cc4bacf2070f83479abb54592c35c7d2c6508000 (diff) | |
| parent | c43112823b1f748822c43ad42566537580c02af2 (diff) | |
| download | cpython-e8ea97fffb591cd71090d0f3114bf1d3bcd31454.zip cpython-e8ea97fffb591cd71090d0f3114bf1d3bcd31454.tar.gz cpython-e8ea97fffb591cd71090d0f3114bf1d3bcd31454.tar.bz2 | |
merge 3.2 (#16369)
| -rw-r--r-- | Modules/symtablemodule.c | 3 | ||||
| -rw-r--r-- | Objects/object.c | 24 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 6 |
3 files changed, 33 insertions, 0 deletions
diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c index f6201e5..02a81f1 100644 --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -63,6 +63,9 @@ PyInit__symtable(void) { PyObject *m; + if (PyType_Ready(&PySTEntry_Type) < 0) + return NULL; + m = PyModule_Create(&symtablemodule); if (m == NULL) return NULL; diff --git a/Objects/object.c b/Objects/object.c index f417184..949e7dc 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1710,6 +1710,30 @@ _Py_ReadyTypes(void) if (PyType_Ready(&_PyNamespace_Type) < 0) Py_FatalError("Can't initialize namespace type"); + + if (PyType_Ready(&PyCapsule_Type) < 0) + Py_FatalError("Can't initialize capsule type"); + + if (PyType_Ready(&PyLongRangeIter_Type) < 0) + Py_FatalError("Can't initialize long range iterator type"); + + if (PyType_Ready(&PyCell_Type) < 0) + Py_FatalError("Can't initialize cell type"); + + if (PyType_Ready(&PyInstanceMethod_Type) < 0) + Py_FatalError("Can't initialize instance method type"); + + if (PyType_Ready(&PyClassMethodDescr_Type) < 0) + Py_FatalError("Can't initialize class method descr type"); + + if (PyType_Ready(&PyMethodDescr_Type) < 0) + Py_FatalError("Can't initialize method descr type"); + + if (PyType_Ready(&PyCallIter_Type) < 0) + Py_FatalError("Can't initialize call iter type"); + + if (PyType_Ready(&PySeqIter_Type) < 0) + Py_FatalError("Can't initialize sequence iterator type"); } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 6c8fe2d..f61f9d0 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14167,6 +14167,12 @@ int _PyUnicode_Init(void) PyType_Ready(&EncodingMapType); + if (PyType_Ready(&PyFieldNameIter_Type) < 0) + Py_FatalError("Can't initialize field name iterator type"); + + if (PyType_Ready(&PyFormatterIter_Type) < 0) + Py_FatalError("Can't initialize formatter iter type"); + #ifdef HAVE_MBCS winver.dwOSVersionInfoSize = sizeof(winver); if (!GetVersionEx((OSVERSIONINFO*)&winver)) { |