[Python-checkins] python/dist/src/Mac/Modules/mlte _Mltemodule.c,1.13,1.14 mltesupport.py,1.11,1.12
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Tue, 03 Dec 2002 15:40:23 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/mlte
In directory sc8-pr-cvs1:/tmp/cvs-serv10318/mlte
Modified Files:
_Mltemodule.c mltesupport.py
Log Message:
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).
Index: _Mltemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/mlte/_Mltemodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** _Mltemodule.c 29 Nov 2002 23:40:44 -0000 1.13
--- _Mltemodule.c 3 Dec 2002 23:40:21 -0000 1.14
***************
*** 1298,1301 ****
--- 1298,1302 ----
#define TXNObj_getsetlist NULL
+
#define TXNObj_compare NULL
***************
*** 1303,1306 ****
--- 1304,1325 ----
#define TXNObj_hash NULL
+ #define TXNObj_tp_init 0
+
+ #define TXNObj_tp_alloc PyType_GenericAlloc
+
+ static PyObject *TXNObj_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ TXNObject itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, TXNObj_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((TXNObjectObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define TXNObj_tp_free PyObject_Del
+
PyTypeObject TXNObject_Type = {
***************
*** 1325,1341 ****
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*/
TXNObj_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
TXNObj_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 1344,1368 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 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*/
TXNObj_methods, /* tp_methods */
! 0, /*tp_members*/
TXNObj_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! TXNObj_tp_init, /* tp_init */
! TXNObj_tp_alloc, /* tp_alloc */
! TXNObj_tp_new, /* tp_new */
! TXNObj_tp_free, /* tp_free */
};
***************
*** 1424,1427 ****
--- 1451,1455 ----
#define TXNFontMenuObj_getsetlist NULL
+
#define TXNFontMenuObj_compare NULL
***************
*** 1429,1432 ****
--- 1457,1478 ----
#define TXNFontMenuObj_hash NULL
+ #define TXNFontMenuObj_tp_init 0
+
+ #define TXNFontMenuObj_tp_alloc PyType_GenericAlloc
+
+ static PyObject *TXNFontMenuObj_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ TXNFontMenuObject itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, TXNFontMenuObj_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((TXNFontMenuObjectObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define TXNFontMenuObj_tp_free PyObject_Del
+
PyTypeObject TXNFontMenuObject_Type = {
***************
*** 1451,1467 ****
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*/
TXNFontMenuObj_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
TXNFontMenuObj_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 1497,1521 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 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*/
TXNFontMenuObj_methods, /* tp_methods */
! 0, /*tp_members*/
TXNFontMenuObj_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! TXNFontMenuObj_tp_init, /* tp_init */
! TXNFontMenuObj_tp_alloc, /* tp_alloc */
! TXNFontMenuObj_tp_new, /* tp_new */
! TXNFontMenuObj_tp_free, /* tp_free */
};
***************
*** 1677,1686 ****
TXNObject_Type.ob_type = &PyType_Type;
Py_INCREF(&TXNObject_Type);
! if (PyDict_SetItemString(d, "TXNObjectType", (PyObject *)&TXNObject_Type) != 0)
! Py_FatalError("can't initialize TXNObjectType");
TXNFontMenuObject_Type.ob_type = &PyType_Type;
Py_INCREF(&TXNFontMenuObject_Type);
! if (PyDict_SetItemString(d, "TXNFontMenuObjectType", (PyObject *)&TXNFontMenuObject_Type) != 0)
! Py_FatalError("can't initialize TXNFontMenuObjectType");
}
--- 1731,1744 ----
TXNObject_Type.ob_type = &PyType_Type;
Py_INCREF(&TXNObject_Type);
! PyModule_AddObject(m, "TXNObject", (PyObject *)&TXNObject_Type);
! /* Backward-compatible name */
! Py_INCREF(&TXNObject_Type);
! PyModule_AddObject(m, "TXNObjectType", (PyObject *)&TXNObject_Type);
TXNFontMenuObject_Type.ob_type = &PyType_Type;
Py_INCREF(&TXNFontMenuObject_Type);
! PyModule_AddObject(m, "TXNFontMenuObject", (PyObject *)&TXNFontMenuObject_Type);
! /* Backward-compatible name */
! Py_INCREF(&TXNFontMenuObject_Type);
! PyModule_AddObject(m, "TXNFontMenuObjectType", (PyObject *)&TXNFontMenuObject_Type);
}
Index: mltesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/mlte/mltesupport.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mltesupport.py 29 Nov 2002 23:40:44 -0000 1.11
--- mltesupport.py 3 Dec 2002 23:40:21 -0000 1.12
***************
*** 137,145 ****
# Our (opaque) objects
! class TXNObjDefinition(PEP252Mixin, GlobalObjectDefinition):
def outputCheckNewArg(self):
Output("if (itself == NULL) return PyMac_Error(resNotFound);")
! class TXNFontMenuObjDefinition(PEP252Mixin, GlobalObjectDefinition):
def outputCheckNewArg(self):
Output("if (itself == NULL) return PyMac_Error(resNotFound);")
--- 137,145 ----
# Our (opaque) objects
! class TXNObjDefinition(PEP253Mixin, GlobalObjectDefinition):
def outputCheckNewArg(self):
Output("if (itself == NULL) return PyMac_Error(resNotFound);")
! class TXNFontMenuObjDefinition(PEP253Mixin, GlobalObjectDefinition):
def outputCheckNewArg(self):
Output("if (itself == NULL) return PyMac_Error(resNotFound);")