merge 3.2 (#16369)

benjaminp · benjaminp · commit e8ea97fffb59 · 2012-10-30T23:27:52.000-04:00
diff --git 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
@@ -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
@@ -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)) {

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ PyInit__symtable(void)`
`63`	`63`	`{`
`64`	`64`	`PyObject *m;`
`65`	`65`
	`66`	`+ if (PyType_Ready(&PySTEntry_Type) < 0)`
	`67`	`+ return NULL;`
	`68`	`+`
`66`	`69`	`m = PyModule_Create(&symtablemodule);`
`67`	`70`	`if (m == NULL)`
`68`	`71`	`return NULL;`