summaryrefslogtreecommitdiffstats
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-31 03:31:12 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-31 03:31:12 (GMT)
commit7ff2094bc7e2c6ecb735116b2187187bb4f58daa (patch)
treee6323d6ceb223235014f15fc833a243298f1684a /Objects/unicodeobject.c
parentbfa664c5cf35345a631b7c6ffca83464d71072fe (diff)
parente8ea97fffb591cd71090d0f3114bf1d3bcd31454 (diff)
downloadcpython-7ff2094bc7e2c6ecb735116b2187187bb4f58daa.zip
cpython-7ff2094bc7e2c6ecb735116b2187187bb4f58daa.tar.gz
cpython-7ff2094bc7e2c6ecb735116b2187187bb4f58daa.tar.bz2
merge 3.3 (#16369)
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c6
1 files changed, 6 insertions, 0 deletions
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)) {