[Python-checkins] python/dist/src/Mac/Modules/ibcarbon IBCarbonsupport.py,1.2,1.3 _IBCarbon.c,1.3,1.4

[jackjansen@users.sourceforge.net]

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

Modified Files:
	IBCarbonsupport.py _IBCarbon.c 
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: IBCarbonsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/IBCarbonsupport.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IBCarbonsupport.py	22 Aug 2002 23:30:48 -0000	1.2
--- IBCarbonsupport.py	29 Nov 2002 23:40:43 -0000	1.3
***************
*** 32,40 ****
  module = MacModule('_IBCarbon', 'IBCarbon', includestuff, finalstuff, initstuff)
  
! class CFReleaserObject(GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("CFRelease(%s);" % name)
  
! class CFNibDesc(GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("DisposeNibReference(%s);" % name)
--- 32,40 ----
  module = MacModule('_IBCarbon', 'IBCarbon', includestuff, finalstuff, initstuff)
  
! class CFReleaserObject(PEP252Mixin, GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("CFRelease(%s);" % name)
  
! class CFNibDesc(PEP252Mixin, GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("DisposeNibReference(%s);" % name)

Index: _IBCarbon.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/_IBCarbon.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _IBCarbon.c	16 Aug 2002 09:09:26 -0000	1.3
--- _IBCarbon.c	29 Nov 2002 23:40:43 -0000	1.4
***************
*** 141,152 ****
  };
  
! PyMethodChain IBNibRefObj_chain = { IBNibRefObj_methods, NULL };
! 
! static PyObject *IBNibRefObj_getattr(IBNibRefObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&IBNibRefObj_chain, (PyObject *)self, name);
! }
! 
! #define IBNibRefObj_setattr NULL
  
  #define IBNibRefObj_compare NULL
--- 141,145 ----
  };
  
! #define IBNibRefObj_getsetlist NULL
  
  #define IBNibRefObj_compare NULL
***************
*** 165,170 ****
  	(destructor) IBNibRefObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) IBNibRefObj_getattr, /*tp_getattr*/
! 	(setattrfunc) IBNibRefObj_setattr, /*tp_setattr*/
  	(cmpfunc) IBNibRefObj_compare, /*tp_compare*/
  	(reprfunc) IBNibRefObj_repr, /*tp_repr*/
--- 158,163 ----
  	(destructor) IBNibRefObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) IBNibRefObj_compare, /*tp_compare*/
  	(reprfunc) IBNibRefObj_repr, /*tp_repr*/
***************
*** 173,176 ****
--- 166,186 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) IBNibRefObj_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*/
+ 	IBNibRefObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	IBNibRefObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };