[Python-checkins] python/dist/src/Mac/Modules/drag _Dragmodule.c,1.10,1.11 dragsupport.py,1.10,1.11

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Dragmodule.c dragsupport.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: _Dragmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/drag/_Dragmodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** _Dragmodule.c	16 Aug 2002 09:09:25 -0000	1.10
--- _Dragmodule.c	29 Nov 2002 23:40:43 -0000	1.11
***************
*** 741,752 ****
  };
  
! PyMethodChain DragObj_chain = { DragObj_methods, NULL };
! 
! static PyObject *DragObj_getattr(DragObjObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&DragObj_chain, (PyObject *)self, name);
! }
! 
! #define DragObj_setattr NULL
  
  #define DragObj_compare NULL
--- 741,745 ----
  };
  
! #define DragObj_getsetlist NULL
  
  #define DragObj_compare NULL
***************
*** 765,770 ****
  	(destructor) DragObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) DragObj_getattr, /*tp_getattr*/
! 	(setattrfunc) DragObj_setattr, /*tp_setattr*/
  	(cmpfunc) DragObj_compare, /*tp_compare*/
  	(reprfunc) DragObj_repr, /*tp_repr*/
--- 758,763 ----
  	(destructor) DragObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) DragObj_compare, /*tp_compare*/
  	(reprfunc) DragObj_repr, /*tp_repr*/
***************
*** 773,776 ****
--- 766,786 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) DragObj_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*/
+ 	DragObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	DragObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: dragsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/drag/dragsupport.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dragsupport.py	25 Mar 2002 00:32:04 -0000	1.10
--- dragsupport.py	29 Nov 2002 23:40:43 -0000	1.11
***************
*** 184,188 ****
  """    
  
! class MyObjectDefinition(GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {
--- 184,188 ----
  """    
  
! class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {