Merge with 3.3

1 files changed, 7 insertions, 1 deletions

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index bf90aba3a2..f794d410c9 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -659,7 +659,7 @@ builtin_compile(PyObject *self, PyObject *args, PyObject *kwds)
         goto finally;
     }
 
-    str = source_as_string(cmd, "compile", "string, bytes, AST or code", &cf);
+    str = source_as_string(cmd, "compile", "string, bytes or AST", &cf);
     if (str == NULL)
         goto error;
 
@@ -2407,6 +2407,12 @@ PyObject *
 _PyBuiltin_Init(void)
 {
     PyObject *mod, *dict, *debug;
+
+    if (PyType_Ready(&PyFilter_Type) < 0 ||
+        PyType_Ready(&PyMap_Type) < 0 ||
+        PyType_Ready(&PyZip_Type) < 0)
+        return NULL;
+
     mod = PyModule_Create(&builtinsmodule);
     if (mod == NULL)
         return NULL;