[Python-checkins] python/dist/src/Mac/Modules/menu _Menumodule.c,1.12,1.13 menusupport.py,1.17,1.18

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Menumodule.c menusupport.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: _Menumodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/_Menumodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** _Menumodule.c	16 Aug 2002 09:09:28 -0000	1.12
--- _Menumodule.c	29 Nov 2002 23:40:44 -0000	1.13
***************
*** 3001,3012 ****
  };
  
! PyMethodChain MenuObj_chain = { MenuObj_methods, NULL };
! 
! static PyObject *MenuObj_getattr(MenuObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&MenuObj_chain, (PyObject *)self, name);
! }
! 
! #define MenuObj_setattr NULL
  
  #define MenuObj_compare NULL
--- 3001,3005 ----
  };
  
! #define MenuObj_getsetlist NULL
  
  #define MenuObj_compare NULL
***************
*** 3025,3030 ****
  	(destructor) MenuObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) MenuObj_getattr, /*tp_getattr*/
! 	(setattrfunc) MenuObj_setattr, /*tp_setattr*/
  	(cmpfunc) MenuObj_compare, /*tp_compare*/
  	(reprfunc) MenuObj_repr, /*tp_repr*/
--- 3018,3023 ----
  	(destructor) MenuObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) MenuObj_compare, /*tp_compare*/
  	(reprfunc) MenuObj_repr, /*tp_repr*/
***************
*** 3033,3036 ****
--- 3026,3046 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) MenuObj_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*/
+ 	MenuObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	MenuObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: menusupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/menusupport.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** menusupport.py	22 Aug 2002 23:30:48 -0000	1.17
--- menusupport.py	29 Nov 2002 23:40:44 -0000	1.18
***************
*** 99,103 ****
  """
  
! class MyObjectDefinition(GlobalObjectDefinition):
  	pass
  
--- 99,103 ----
  """
  
! class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	pass