merge 3.3 (#16369)

2 files changed, 30 insertions, 0 deletions

diff --git a/Objects/object.c b/Objects/object.c
index 858eebe..b4bc96d 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1719,6 +1719,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 0f5bdfc..048361e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -14222,6 +14222,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)) {