[Python-checkins] python/dist/src/Mac/Modules/cm _Cmmodule.c,1.10,1.11 cmsupport.py,1.6,1.7

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Cmmodule.c cmsupport.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: _Cmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cm/_Cmmodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** _Cmmodule.c	16 Aug 2002 09:09:19 -0000	1.10
--- _Cmmodule.c	29 Nov 2002 23:40:42 -0000	1.11
***************
*** 306,317 ****
  };
  
! PyMethodChain CmpInstObj_chain = { CmpInstObj_methods, NULL };
! 
! static PyObject *CmpInstObj_getattr(ComponentInstanceObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&CmpInstObj_chain, (PyObject *)self, name);
! }
! 
! #define CmpInstObj_setattr NULL
  
  #define CmpInstObj_compare NULL
--- 306,310 ----
  };
  
! #define CmpInstObj_getsetlist NULL
  
  #define CmpInstObj_compare NULL
***************
*** 330,335 ****
  	(destructor) CmpInstObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) CmpInstObj_getattr, /*tp_getattr*/
! 	(setattrfunc) CmpInstObj_setattr, /*tp_setattr*/
  	(cmpfunc) CmpInstObj_compare, /*tp_compare*/
  	(reprfunc) CmpInstObj_repr, /*tp_repr*/
--- 323,328 ----
  	(destructor) CmpInstObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) CmpInstObj_compare, /*tp_compare*/
  	(reprfunc) CmpInstObj_repr, /*tp_repr*/
***************
*** 338,341 ****
--- 331,351 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) CmpInstObj_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*/
+ 	CmpInstObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	CmpInstObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  
***************
*** 702,713 ****
  };
  
! PyMethodChain CmpObj_chain = { CmpObj_methods, NULL };
! 
! static PyObject *CmpObj_getattr(ComponentObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&CmpObj_chain, (PyObject *)self, name);
! }
! 
! #define CmpObj_setattr NULL
  
  #define CmpObj_compare NULL
--- 712,716 ----
  };
  
! #define CmpObj_getsetlist NULL
  
  #define CmpObj_compare NULL
***************
*** 726,731 ****
  	(destructor) CmpObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) CmpObj_getattr, /*tp_getattr*/
! 	(setattrfunc) CmpObj_setattr, /*tp_setattr*/
  	(cmpfunc) CmpObj_compare, /*tp_compare*/
  	(reprfunc) CmpObj_repr, /*tp_repr*/
--- 729,734 ----
  	(destructor) CmpObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) CmpObj_compare, /*tp_compare*/
  	(reprfunc) CmpObj_repr, /*tp_repr*/
***************
*** 734,737 ****
--- 737,757 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) CmpObj_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*/
+ 	CmpObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	CmpObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: cmsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cm/cmsupport.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cmsupport.py	25 Mar 2002 00:32:13 -0000	1.6
--- cmsupport.py	29 Nov 2002 23:40:42 -0000	1.7
***************
*** 80,84 ****
  ComponentResourceHandle = OpaqueByValueType("ComponentResourceHandle", "ResObj")
  
! class MyCIObjectDefinition(GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {
--- 80,84 ----
  ComponentResourceHandle = OpaqueByValueType("ComponentResourceHandle", "ResObj")
  
! class MyCIObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {
***************
*** 87,91 ****
  				}""")
  
! class MyCObjectDefinition(GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {
--- 87,91 ----
  				}""")
  
! class MyCObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {