commit e8ea97fffb591cd71090d0f3114bf1d3bcd31454
author Benjamin Peterson <benjamin@python.org> Tue Oct 30 23:27:52 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Tue Oct 30 23:27:52 2012 -0400
tree 3710073dcda7cfa947f97676c4edd305bb38952f
parent cc4bacf2070f83479abb54592c35c7d2c6508000
parent c43112823b1f748822c43ad42566537580c02af2

merge 3.2 (#16369)

Modules/symtablemodule.c

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 @@
 {
     PyObject *m;
 
+    if (PyType_Ready(&PySTEntry_Type) < 0)
+        return NULL;
+
     m = PyModule_Create(&symtablemodule);
     if (m == NULL)
         return NULL;

Objects/object.c

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 @@
 
     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");
 }
 
 

Objects/unicodeobject.c

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 @@
 
     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)) {