[Python-checkins] python/dist/src/Mac/Modules/ctl _Ctlmodule.c,1.19,1.20 ctlsupport.py,1.50,1.51

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Ctlmodule.c ctlsupport.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: _Ctlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/_Ctlmodule.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** _Ctlmodule.c	16 Aug 2002 09:09:19 -0000	1.19
--- _Ctlmodule.c	29 Nov 2002 23:40:42 -0000	1.20
***************
*** 4544,4555 ****
  };
  
! PyMethodChain CtlObj_chain = { CtlObj_methods, NULL };
! 
! static PyObject *CtlObj_getattr(ControlObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&CtlObj_chain, (PyObject *)self, name);
! }
! 
! #define CtlObj_setattr NULL
  
  static int CtlObj_compare(ControlObject *self, ControlObject *other)
--- 4544,4548 ----
  };
  
! #define CtlObj_getsetlist NULL
  
  static int CtlObj_compare(ControlObject *self, ControlObject *other)
***************
*** 4588,4593 ****
  	(destructor) CtlObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) CtlObj_getattr, /*tp_getattr*/
! 	(setattrfunc) CtlObj_setattr, /*tp_setattr*/
  	(cmpfunc) CtlObj_compare, /*tp_compare*/
  	(reprfunc) CtlObj_repr, /*tp_repr*/
--- 4581,4586 ----
  	(destructor) CtlObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) CtlObj_compare, /*tp_compare*/
  	(reprfunc) CtlObj_repr, /*tp_repr*/
***************
*** 4596,4599 ****
--- 4589,4609 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) CtlObj_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*/
+ 	CtlObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	CtlObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: ctlsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/ctlsupport.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** ctlsupport.py	5 Aug 2002 15:36:56 -0000	1.50
--- ctlsupport.py	29 Nov 2002 23:40:42 -0000	1.51
***************
*** 491,495 ****
  """
  
! class MyObjectDefinition(ObjectIdentityMixin, GlobalObjectDefinition):
  	def outputStructMembers(self):
  		GlobalObjectDefinition.outputStructMembers(self)
--- 491,495 ----
  """
  
! class MyObjectDefinition(PEP252Mixin, ObjectIdentityMixin, GlobalObjectDefinition):
  	def outputStructMembers(self):
  		GlobalObjectDefinition.outputStructMembers(self)