[Python-checkins] python/dist/src/Mac/Modules/alias _Aliasmodule.c,1.1,1.2 aliassupport.py,1.1,1.2

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Aliasmodule.c aliassupport.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: _Aliasmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/alias/_Aliasmodule.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _Aliasmodule.c	22 Nov 2002 15:53:32 -0000	1.1
--- _Aliasmodule.c	29 Nov 2002 23:40:41 -0000	1.2
***************
*** 96,107 ****
  };
  
! PyMethodChain AliasObj_chain = { AliasObj_methods, NULL };
! 
! static PyObject *AliasObj_getattr(AliasObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&AliasObj_chain, (PyObject *)self, name);
! }
! 
! #define AliasObj_setattr NULL
  
  #define AliasObj_compare NULL
--- 96,100 ----
  };
  
! #define AliasObj_getsetlist NULL
  
  #define AliasObj_compare NULL
***************
*** 120,125 ****
  	(destructor) AliasObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) AliasObj_getattr, /*tp_getattr*/
! 	(setattrfunc) AliasObj_setattr, /*tp_setattr*/
  	(cmpfunc) AliasObj_compare, /*tp_compare*/
  	(reprfunc) AliasObj_repr, /*tp_repr*/
--- 113,118 ----
  	(destructor) AliasObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) AliasObj_compare, /*tp_compare*/
  	(reprfunc) AliasObj_repr, /*tp_repr*/
***************
*** 128,131 ****
--- 121,141 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) AliasObj_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*/
+ 	AliasObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	AliasObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: aliassupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/alias/aliassupport.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aliassupport.py	22 Nov 2002 15:53:32 -0000	1.1
--- aliassupport.py	29 Nov 2002 23:40:41 -0000	1.2
***************
*** 73,77 ****
  module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
  
! class AliasDefinition(GlobalObjectDefinition):
  
  	def outputCheckNewArg(self):
--- 73,77 ----
  module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)
  
! class AliasDefinition(PEP252Mixin, GlobalObjectDefinition):
  
  	def outputCheckNewArg(self):