- Rename PyType_InitDict() to PyType_Ready().

gvanrossum · gvanrossum · commit 528b7eb0b0fa · 2001-08-07T17:24:28.000Z
- Add an explicit call to PyType_Ready(&amp;PyList_Type) to pythonrun.c
  (just for the heck of it, really -- we should either explicitly
  ready all types, or none).
diff --git a/Include/object.h b/Include/object.h
@@ -297,7 +297,7 @@ extern DL_IMPORT(PyTypeObject) PyBaseObject_Type; /* Most base object type */
 
 #define PyType_Check(op) PyObject_TypeCheck(op, &PyType_Type)
 
-extern DL_IMPORT(int) PyType_InitDict(PyTypeObject *);
+extern DL_IMPORT(int) PyType_Ready(PyTypeObject *);
 extern DL_IMPORT(PyObject *) PyType_GenericAlloc(PyTypeObject *, int);
 extern DL_IMPORT(PyObject *) PyType_GenericNew(PyTypeObject *,
 					       PyObject *, PyObject *);
diff --git a/Modules/xxsubtype.c b/Modules/xxsubtype.c
@@ -212,9 +212,9 @@ initxxsubtype(void)
 	if (m == NULL)
 		return;
 
-	if (PyType_InitDict(&spamlist_type) < 0)
+	if (PyType_Ready(&spamlist_type) < 0)
 		return;
-	if (PyType_InitDict(&spamdict_type) < 0)
+	if (PyType_Ready(&spamdict_type) < 0)
 		return;
 
 	d = PyModule_GetDict(m);
diff --git a/Objects/object.c b/Objects/object.c
@@ -1160,7 +1160,7 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name)
 	PyObject **dictptr;
 
 	if (tp->tp_dict == NULL) {
-		if (PyType_InitDict(tp) < 0)
+		if (PyType_Ready(tp) < 0)
 			return NULL;
 	}
 
@@ -1207,7 +1207,7 @@ PyObject_GenericSetAttr(PyObject *obj, PyObject *name, PyObject *value)
 	PyObject **dictptr;
 
 	if (tp->tp_dict == NULL) {
-		if (PyType_InitDict(tp) < 0)
+		if (PyType_Ready(tp) < 0)
 			return -1;
 	}
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -387,7 +387,7 @@ best_base(PyObject *bases)
 			return NULL;
 		}
 		if (base_i->tp_dict == NULL) {
-			if (PyType_InitDict(base_i) < 0)
+			if (PyType_Ready(base_i) < 0)
 				return NULL;
 		}
 		candidate = solid_base(base_i);
@@ -656,7 +656,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
 	type->tp_free = _PyObject_Del;
 
 	/* Initialize the rest */
-	if (PyType_InitDict(type) < 0) {
+	if (PyType_Ready(type) < 0) {
 		Py_DECREF(type);
 		return NULL;
 	}
@@ -719,7 +719,7 @@ type_getattro(PyTypeObject *type, PyObject *name)
 
 	/* Initialize this type (we'll assume the metatype is initialized) */
 	if (type->tp_dict == NULL) {
-		if (PyType_InitDict(type) < 0)
+		if (PyType_Ready(type) < 0)
 			return NULL;
 	}
 
@@ -1157,7 +1157,7 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base)
 }
 
 int
-PyType_InitDict(PyTypeObject *type)
+PyType_Ready(PyTypeObject *type)
 {
 	PyObject *dict, *bases, *x;
 	PyTypeObject *base;
@@ -1185,7 +1185,7 @@ PyType_InitDict(PyTypeObject *type)
 
 	/* Initialize the base class */
 	if (base && base->tp_dict == NULL) {
-		if (PyType_InitDict(base) < 0)
+		if (PyType_Ready(base) < 0)
 			return -1;
 	}
 
@@ -1892,7 +1892,7 @@ add_tp_new_wrapper(PyTypeObject *type)
 	return PyDict_SetItemString(type->tp_defined, "__new__", func);
 }
 
-/* This function is called by PyType_InitDict() to populate the type's
+/* This function is called by PyType_Ready() to populate the type's
    dictionary with method descriptors for function slots.  For each
    function slot (like tp_repr) that's defined in the type, one or
    more corresponding descriptors are added in the type's tp_defined
@@ -2335,7 +2335,7 @@ slot_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 /* This is called at the very end of type_new() (even after
-   PyType_InitDict()) to complete the initialization of dynamic types.
+   PyType_Ready()) to complete the initialization of dynamic types.
    The dict argument is the dictionary argument passed to type_new(),
    which is the local namespace of the class statement, in other
    words, it contains the methods.  For each special method (like
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -115,9 +115,12 @@ Py_Initialize(void)
 		Py_FatalError("Py_Initialize: can't make first thread");
 	(void) PyThreadState_Swap(tstate);
 
-	if (PyType_InitDict(&PyType_Type) < 0)
+	if (PyType_Ready(&PyType_Type) < 0)
 		Py_FatalError("Py_Initialize: can't initialize 'type'");
 
+	if (PyType_Ready(&PyList_Type) < 0)
+		Py_FatalError("Py_Initialize: can't initialize 'list'");
+
 	interp->modules = PyDict_New();
 	if (interp->modules == NULL)
 		Py_FatalError("Py_Initialize: can't make modules dictionary");

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,7 @@ PyObject_GenericGetAttr(PyObject obj, PyObject name)`
`1160`	`1160`	`PyObject **dictptr;`
`1161`	`1161`
`1162`	`1162`	`if (tp->tp_dict == NULL) {`
`1163`		`- if (PyType_InitDict(tp) < 0)`
	`1163`	`+ if (PyType_Ready(tp) < 0)`
`1164`	`1164`	`return NULL;`
`1165`	`1165`	`}`
`1166`	`1166`
`@@ -1207,7 +1207,7 @@ PyObject_GenericSetAttr(PyObject obj, PyObject name, PyObject *value)`
`1207`	`1207`	`PyObject **dictptr;`
`1208`	`1208`
`1209`	`1209`	`if (tp->tp_dict == NULL) {`
`1210`		`- if (PyType_InitDict(tp) < 0)`
	`1210`	`+ if (PyType_Ready(tp) < 0)`
`1211`	`1211`	`return -1;`
`1212`	`1212`	`}`
`1213`	`1213`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ best_base(PyObject *bases)`
`387`	`387`	`return NULL;`
`388`	`388`	`}`
`389`	`389`	`if (base_i->tp_dict == NULL) {`
`390`		`- if (PyType_InitDict(base_i) < 0)`
	`390`	`+ if (PyType_Ready(base_i) < 0)`
`391`	`391`	`return NULL;`
`392`	`392`	`}`
`393`	`393`	`candidate = solid_base(base_i);`
`@@ -656,7 +656,7 @@ type_new(PyTypeObject metatype, PyObject args, PyObject *kwds)`
`656`	`656`	`type->tp_free = _PyObject_Del;`
`657`	`657`
`658`	`658`	`/* Initialize the rest */`
`659`		`- if (PyType_InitDict(type) < 0) {`
	`659`	`+ if (PyType_Ready(type) < 0) {`
`660`	`660`	`Py_DECREF(type);`
`661`	`661`	`return NULL;`
`662`	`662`	`}`
`@@ -719,7 +719,7 @@ type_getattro(PyTypeObject type, PyObject name)`
`719`	`719`
`720`	`720`	`/* Initialize this type (we'll assume the metatype is initialized) */`
`721`	`721`	`if (type->tp_dict == NULL) {`
`722`		`- if (PyType_InitDict(type) < 0)`
	`722`	`+ if (PyType_Ready(type) < 0)`
`723`	`723`	`return NULL;`
`724`	`724`	`}`
`725`	`725`
`@@ -1157,7 +1157,7 @@ inherit_slots(PyTypeObject type, PyTypeObject base)`
`1157`	`1157`	`}`
`1158`	`1158`
`1159`	`1159`	`int`
`1160`		`-PyType_InitDict(PyTypeObject *type)`
	`1160`	`+PyType_Ready(PyTypeObject *type)`
`1161`	`1161`	`{`
`1162`	`1162`	`PyObject dict, bases, *x;`
`1163`	`1163`	`PyTypeObject *base;`
`@@ -1185,7 +1185,7 @@ PyType_InitDict(PyTypeObject *type)`
`1185`	`1185`
`1186`	`1186`	`/* Initialize the base class */`
`1187`	`1187`	`if (base && base->tp_dict == NULL) {`
`1188`		`- if (PyType_InitDict(base) < 0)`
	`1188`	`+ if (PyType_Ready(base) < 0)`
`1189`	`1189`	`return -1;`
`1190`	`1190`	`}`
`1191`	`1191`
`@@ -1892,7 +1892,7 @@ add_tp_new_wrapper(PyTypeObject *type)`
`1892`	`1892`	`return PyDict_SetItemString(type->tp_defined, "__new__", func);`
`1893`	`1893`	`}`
`1894`	`1894`
`1895`		`-/* This function is called by PyType_InitDict() to populate the type's`
	`1895`	`+/* This function is called by PyType_Ready() to populate the type's`
`1896`	`1896`	`dictionary with method descriptors for function slots. For each`
`1897`	`1897`	`function slot (like tp_repr) that's defined in the type, one or`
`1898`	`1898`	`more corresponding descriptors are added in the type's tp_defined`
`@@ -2335,7 +2335,7 @@ slot_tp_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`2335`	`2335`	`}`
`2336`	`2336`
`2337`	`2337`	`/* This is called at the very end of type_new() (even after`
`2338`		`- PyType_InitDict()) to complete the initialization of dynamic types.`
	`2338`	`+ PyType_Ready()) to complete the initialization of dynamic types.`
`2339`	`2339`	`The dict argument is the dictionary argument passed to type_new(),`
`2340`	`2340`	`which is the local namespace of the class statement, in other`
`2341`	`2341`	`words, it contains the methods. For each special method (like`