[Python-checkins] python/dist/src/Mac/Modules/app _Appmodule.c,1.12,1.13 appsupport.py,1.15,1.16

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Appmodule.c appsupport.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: _Appmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/_Appmodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** _Appmodule.c	16 Aug 2002 09:09:13 -0000	1.12
--- _Appmodule.c	29 Nov 2002 23:40:41 -0000	1.13
***************
*** 114,125 ****
  };
  
! PyMethodChain ThemeDrawingStateObj_chain = { ThemeDrawingStateObj_methods, NULL };
! 
! static PyObject *ThemeDrawingStateObj_getattr(ThemeDrawingStateObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&ThemeDrawingStateObj_chain, (PyObject *)self, name);
! }
! 
! #define ThemeDrawingStateObj_setattr NULL
  
  #define ThemeDrawingStateObj_compare NULL
--- 114,118 ----
  };
  
! #define ThemeDrawingStateObj_getsetlist NULL
  
  #define ThemeDrawingStateObj_compare NULL
***************
*** 138,143 ****
  	(destructor) ThemeDrawingStateObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) ThemeDrawingStateObj_getattr, /*tp_getattr*/
! 	(setattrfunc) ThemeDrawingStateObj_setattr, /*tp_setattr*/
  	(cmpfunc) ThemeDrawingStateObj_compare, /*tp_compare*/
  	(reprfunc) ThemeDrawingStateObj_repr, /*tp_repr*/
--- 131,136 ----
  	(destructor) ThemeDrawingStateObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) ThemeDrawingStateObj_compare, /*tp_compare*/
  	(reprfunc) ThemeDrawingStateObj_repr, /*tp_repr*/
***************
*** 146,149 ****
--- 139,159 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) ThemeDrawingStateObj_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*/
+ 	ThemeDrawingStateObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	ThemeDrawingStateObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: appsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/appsupport.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** appsupport.py	22 Aug 2002 23:30:48 -0000	1.15
--- appsupport.py	29 Nov 2002 23:40:41 -0000	1.16
***************
*** 95,99 ****
  """
  
! class MyObjectDefinition(GlobalObjectDefinition):
  	pass
  ## 	def outputCheckNewArg(self):
--- 95,99 ----
  """
  
! class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	pass
  ## 	def outputCheckNewArg(self):