try to initalize all builtin types with PyType_Ready to avoid problems like #5787
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index c8cf71b..4ac1ab0 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -606,14 +606,6 @@
builtin_object = PyString_InternFromString("__builtins__");
if (builtin_object == NULL)
return 0;
- /*
- Traceback objects are not created the normal way (through calling the
- type), so PyType_Ready has to be called here.
- */
- if (PyType_Ready(&PyTraceBack_Type)) {
- Py_DECREF(builtin_object);
- return 0;
- }
return 1;
}
diff --git a/Objects/object.c b/Objects/object.c
index 7395b0c..b8f1352 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -2033,28 +2033,88 @@
_Py_ReadyTypes(void)
{
if (PyType_Ready(&PyType_Type) < 0)
- Py_FatalError("Can't initialize 'type'");
+ Py_FatalError("Can't initialize type type");
if (PyType_Ready(&_PyWeakref_RefType) < 0)
- Py_FatalError("Can't initialize 'weakref'");
+ Py_FatalError("Can't initialize weakref type");
if (PyType_Ready(&PyBool_Type) < 0)
- Py_FatalError("Can't initialize 'bool'");
+ Py_FatalError("Can't initialize bool type");
if (PyType_Ready(&PyString_Type) < 0)
- Py_FatalError("Can't initialize 'str'");
+ Py_FatalError("Can't initialize str type");
if (PyType_Ready(&PyByteArray_Type) < 0)
- Py_FatalError("Can't initialize 'bytes'");
+ Py_FatalError("Can't initialize bytearray");
if (PyType_Ready(&PyList_Type) < 0)
- Py_FatalError("Can't initialize 'list'");
+ Py_FatalError("Can't initialize list");
if (PyType_Ready(&PyNone_Type) < 0)
- Py_FatalError("Can't initialize type(None)");
+ Py_FatalError("Can't initialize None type");
if (PyType_Ready(&PyNotImplemented_Type) < 0)
- Py_FatalError("Can't initialize type(NotImplemented)");
+ Py_FatalError("Can't initialize NotImplemented type");
+
+ if (PyType_Ready(&PyTraceBack_Type) < 0)
+ Py_FatalError("Can't initialize traceback type");
+
+ if (PyType_Ready(&PySuper_Type) < 0)
+ Py_FatalError("Can't initialize super type");
+
+ if (PyType_Ready(&PyBaseObject_Type) < 0)
+ Py_FatalError("Can't initialize object type");
+
+ if (PyType_Ready(&PyRange_Type) < 0)
+ Py_FatalError("Can't initialize xrange type");
+
+ if (PyType_Ready(&PyDict_Type) < 0)
+ Py_FatalError("Can't initialize dict type");
+
+ if (PyType_Ready(&PySet_Type) < 0)
+ Py_FatalError("Can't initialize set type");
+
+ if (PyType_Ready(&PyUnicode_Type) < 0)
+ Py_FatalError("Can't initialize unicode type");
+
+ if (PyType_Ready(&PySlice_Type) < 0)
+ Py_FatalError("Can't initialize slice type");
+
+ if (PyType_Ready(&PyStaticMethod_Type) < 0)
+ Py_FatalError("Can't initialize static method type");
+
+ if (PyType_Ready(&PyComplex_Type) < 0)
+ Py_FatalError("Can't initalize complex type");
+
+ if (PyType_Ready(&PyFloat_Type) < 0)
+ Py_FatalError("Can't initalize float type");
+
+ if (PyType_Ready(&PyBuffer_Type) < 0)
+ Py_FatalError("Can't initialize buffer type");
+
+ if (PyType_Ready(&PyLong_Type) < 0)
+ Py_FatalError("Can't initialize long type");
+
+ if (PyType_Ready(&PyInt_Type) < 0)
+ Py_FatalError("Can't initialize int type");
+
+ if (PyType_Ready(&PyFrozenSet_Type) < 0)
+ Py_FatalError("Can't initialize frozenset type");
+
+ if (PyType_Ready(&PyProperty_Type) < 0)
+ Py_FatalError("Can't initialize property type");
+
+ if (PyType_Ready(&PyMemoryView_Type) < 0)
+ Py_FatalError("Can't initialize memoryview type");
+
+ if (PyType_Ready(&PyTuple_Type) < 0)
+ Py_FatalError("Can't initalize tuple type");
+
+ if (PyType_Ready(&PyEnum_Type) < 0)
+ Py_FatalError("Can't initalize enumerate type");
+
+ if (PyType_Ready(&PyReversed_Type) < 0)
+ Py_FatalError("Can't initalize reversed type");
}