mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.2 (#16369)

Browse source
This commit is contained in:
Benjamin Peterson 2012-10-30 23:27:52 -04:00
commit e8ea97fffb
3 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Modules/symtablemodule.c
View file

@ -63,6 +63,9 @@ PyInit__symtable(void)
{ {
PyObject *m; PyObject *m;
if (PyType_Ready(&PySTEntry_Type) < 0)
return NULL;
m = PyModule_Create(&symtablemodule); m = PyModule_Create(&symtablemodule);
if (m == NULL) if (m == NULL)
return NULL; return NULL;

24
Objects/object.c
View file

@ -1710,6 +1710,30 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&_PyNamespace_Type) < 0) if (PyType_Ready(&_PyNamespace_Type) < 0)
Py_FatalError("Can't initialize namespace type"); 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");
} }

6
Objects/unicodeobject.c
View file

@ -14167,6 +14167,12 @@ int _PyUnicode_Init(void)
PyType_Ready(&EncodingMapType); 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 #ifdef HAVE_MBCS
winver.dwOSVersionInfoSize = sizeof(winver); winver.dwOSVersionInfoSize = sizeof(winver);
if (!GetVersionEx((OSVERSIONINFO*)&winver)) { if (!GetVersionEx((OSVERSIONINFO*)&winver)) {