Added PEP253 support to most Carbon modules. This isn't complete yet:

some of the more compilcated cases (CF, Res) haven't been done yet. Also,
various types should inherit from each other (anything with an as_Resource
method should be a Resource subtype, the CF types should become one family).

2 files changed, 43 insertions, 14 deletions

diff --git a/Mac/Modules/list/_Listmodule.c b/Mac/Modules/list/_Listmodule.c
index 559f543..6f89cbf 100644
--- a/Mac/Modules/list/_Listmodule.c
+++ b/Mac/Modules/list/_Listmodule.c
@@ -806,6 +806,24 @@ static PyGetSetDef ListObj_getsetlist[] = {
 #define ListObj_repr NULL
 
 #define ListObj_hash NULL
+#define ListObj_tp_init 0
+
+#define ListObj_tp_alloc PyType_GenericAlloc
+
+static PyObject *ListObj_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+	PyObject *self;
+	ListHandle itself;
+	char *kw[] = {"itself", 0};
+
+	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, ListObj_Convert, &itself)) return NULL;
+	if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+	((ListObject *)self)->ob_itself = itself;
+	return self;
+}
+
+#define ListObj_tp_free PyObject_Del
+
 
 PyTypeObject List_Type = {
 	PyObject_HEAD_INIT(NULL)
@@ -828,19 +846,27 @@ PyTypeObject List_Type = {
 	0, /*tp_str*/
 	PyObject_GenericGetAttr, /*tp_getattro*/
 	PyObject_GenericSetAttr, /*tp_setattro */
-	0, /*outputHook_tp_as_buffer*/
-	0, /*outputHook_tp_flags*/
-	0, /*outputHook_tp_doc*/
-	0, /*outputHook_tp_traverse*/
-	0, /*outputHook_tp_clear*/
-	0, /*outputHook_tp_richcompare*/
-	0, /*outputHook_tp_weaklistoffset*/
-	0, /*outputHook_tp_iter*/
-	0, /*outputHook_tp_iternext*/
+	0, /*tp_as_buffer*/
+	Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
+	0, /*tp_doc*/
+	0, /*tp_traverse*/
+	0, /*tp_clear*/
+	0, /*tp_richcompare*/
+	0, /*tp_weaklistoffset*/
+	0, /*tp_iter*/
+	0, /*tp_iternext*/
 	ListObj_methods, /* tp_methods */
-	0, /*outputHook_tp_members*/
+	0, /*tp_members*/
 	ListObj_getsetlist, /*tp_getset*/
-	0, /*outputHook_tp_base*/
+	0, /*tp_base*/
+	0, /*tp_dict*/
+	0, /*tp_descr_get*/
+	0, /*tp_descr_set*/
+	0, /*tp_dictoffset*/
+	ListObj_tp_init, /* tp_init */
+	ListObj_tp_alloc, /* tp_alloc */
+	ListObj_tp_new, /* tp_new */
+	ListObj_tp_free, /* tp_free */
 };
 
 /* ---------------------- End object type List ---------------------- */
@@ -1186,8 +1212,10 @@ void init_List(void)
 		return;
 	List_Type.ob_type = &PyType_Type;
 	Py_INCREF(&List_Type);
-	if (PyDict_SetItemString(d, "ListType", (PyObject *)&List_Type) != 0)
-		Py_FatalError("can't initialize ListType");
+	PyModule_AddObject(m, "List", (PyObject *)&List_Type);
+	/* Backward-compatible name */
+	Py_INCREF(&List_Type);
+	PyModule_AddObject(m, "ListType", (PyObject *)&List_Type);
 }
 
 /* ======================== End module _List ======================== */
diff --git a/Mac/Modules/list/listsupport.py b/Mac/Modules/list/listsupport.py
index 87ed702..d1f2f10 100644
--- a/Mac/Modules/list/listsupport.py
+++ b/Mac/Modules/list/listsupport.py
@@ -137,7 +137,8 @@ class ListMethodGenerator(MethodGenerator):
 		FunctionGenerator.parseArgumentList(self, args)
 		self.argumentList.append(self.itself)
 
-class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
+class MyObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
+	# XXXX Should inherit from Resource
 	getsetlist = [(
 		'listFlags',
 		'return Py_BuildValue("l", (long)GetListFlags(self->ob_itself) & 0xff);',