diff options
author | Benjamin Peterson <benjamin@python.org> | 2012-10-30 23:27:52 -0400 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2012-10-30 23:27:52 -0400 |
commit | e8ea97fffb591cd71090d0f3114bf1d3bcd31454 (patch) | |
tree | 3710073dcda7cfa947f97676c4edd305bb38952f /Objects/unicodeobject.c | |
parent | cc4bacf2070f83479abb54592c35c7d2c6508000 (diff) | |
parent | c43112823b1f748822c43ad42566537580c02af2 (diff) | |
download | cpython-git-e8ea97fffb591cd71090d0f3114bf1d3bcd31454.tar.gz |
merge 3.2 (#16369)
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r-- | Objects/unicodeobject.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 6c8fe2d865..f61f9d0df1 100644 --- 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)) { |