merge 3.2 (#16369)

diff --cc Objects/object.c
index f41718424d83392879d8b05d887769cb5b5774ef,28bb9c1e46a526bdaedc76810a48134e656df353..949e7dc7f39d482f7308c424c149515cae4e415c
--- 1/Objects/object.c
--- 2/Objects/object.c
+++ b/Objects/object.c
@@@ -1708,8 -1645,29 +1708,32 @@@ _Py_ReadyTypes(void
      if (PyType_Ready(&PyZip_Type) < 0)
          Py_FatalError("Can't initialize zip type");
  
 +    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 --cc Objects/unicodeobject.c
index 6c8fe2d865b0f8459b1f4b08175325f525d238e0,35b424e33ab36276c99595efe776a5b8857023d1..f61f9d0df190f09afc2f5c3334ed5b6696940c17
--- 1/Objects/unicodeobject.c
--- 2/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@@ -14167,14 -10080,11 +14167,20 @@@ 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)) {
 +        PyErr_SetFromWindowsErr(0);
 +        return -1;
 +    }
 +#endif
 +    return 0;
  }
  
  /* Finalize the Unicode implementation */