[Python-checkins] python/dist/src/Mac/Modules/mlte _Mltemodule.c,1.12,1.13 mltesupport.py,1.10,1.11

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/mlte
In directory sc8-pr-cvs1:/tmp/cvs-serv8673/mlte

Modified Files:
	_Mltemodule.c mltesupport.py 
Log Message:
Converted the Carbon modules to use PEP252-style objects, with
descriptors in stead of manual getattr hooks to get at attributes
of the objects.

For Qd I have in stead gotten rid of most of the attribute access
in favor of the carbon-style accessor methods (with the exception
of visRgn, to be done later), and of the Carbon.Qd.qd global object,
for which accessor functions are also available.

For List I have fixed the fact that various methods were incorrectly
generated as functions.

CF is untouched: PEP252 doesn't allow "poor-mans-inheritance" with
basechain, so it will have to wait for PEP253 support.


Index: _Mltemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/mlte/_Mltemodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** _Mltemodule.c	22 Aug 2002 23:30:48 -0000	1.12
--- _Mltemodule.c	29 Nov 2002 23:40:44 -0000	1.13
***************
*** 1296,1307 ****
  };
  
! PyMethodChain TXNObj_chain = { TXNObj_methods, NULL };
! 
! static PyObject *TXNObj_getattr(TXNObjectObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&TXNObj_chain, (PyObject *)self, name);
! }
! 
! #define TXNObj_setattr NULL
  
  #define TXNObj_compare NULL
--- 1296,1300 ----
  };
  
! #define TXNObj_getsetlist NULL
  
  #define TXNObj_compare NULL
***************
*** 1320,1325 ****
  	(destructor) TXNObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) TXNObj_getattr, /*tp_getattr*/
! 	(setattrfunc) TXNObj_setattr, /*tp_setattr*/
  	(cmpfunc) TXNObj_compare, /*tp_compare*/
  	(reprfunc) TXNObj_repr, /*tp_repr*/
--- 1313,1318 ----
  	(destructor) TXNObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) TXNObj_compare, /*tp_compare*/
  	(reprfunc) TXNObj_repr, /*tp_repr*/
***************
*** 1328,1331 ****
--- 1321,1341 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) TXNObj_hash, /*tp_hash*/
+ 	0, /*tp_call*/
+ 	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*/
+ 	TXNObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	TXNObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  
***************
*** 1412,1423 ****
  };
  
! PyMethodChain TXNFontMenuObj_chain = { TXNFontMenuObj_methods, NULL };
! 
! static PyObject *TXNFontMenuObj_getattr(TXNFontMenuObjectObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&TXNFontMenuObj_chain, (PyObject *)self, name);
! }
! 
! #define TXNFontMenuObj_setattr NULL
  
  #define TXNFontMenuObj_compare NULL
--- 1422,1426 ----
  };
  
! #define TXNFontMenuObj_getsetlist NULL
  
  #define TXNFontMenuObj_compare NULL
***************
*** 1436,1441 ****
  	(destructor) TXNFontMenuObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) TXNFontMenuObj_getattr, /*tp_getattr*/
! 	(setattrfunc) TXNFontMenuObj_setattr, /*tp_setattr*/
  	(cmpfunc) TXNFontMenuObj_compare, /*tp_compare*/
  	(reprfunc) TXNFontMenuObj_repr, /*tp_repr*/
--- 1439,1444 ----
  	(destructor) TXNFontMenuObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) TXNFontMenuObj_compare, /*tp_compare*/
  	(reprfunc) TXNFontMenuObj_repr, /*tp_repr*/
***************
*** 1444,1447 ****
--- 1447,1467 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) TXNFontMenuObj_hash, /*tp_hash*/
+ 	0, /*tp_call*/
+ 	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*/
+ 	TXNFontMenuObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	TXNFontMenuObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: mltesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/mlte/mltesupport.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mltesupport.py	22 Aug 2002 23:30:48 -0000	1.10
--- mltesupport.py	29 Nov 2002 23:40:44 -0000	1.11
***************
*** 137,145 ****
  # Our (opaque) objects
  
! class TXNObjDefinition(GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("if (itself == NULL) return PyMac_Error(resNotFound);")
  
! class TXNFontMenuObjDefinition(GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("if (itself == NULL) return PyMac_Error(resNotFound);")
--- 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);")