mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 06:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

6
Objects/unicodeobject.c
View file

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