[Python-checkins] python/dist/src/Mac/Modules/win _Winmodule.c,1.11,1.12 winsupport.py,1.31,1.32

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Winmodule.c winsupport.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: _Winmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/_Winmodule.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** _Winmodule.c	16 Aug 2002 09:09:31 -0000	1.11
--- _Winmodule.c	29 Nov 2002 23:40:47 -0000	1.12
***************
*** 2927,2938 ****
  };
  
! PyMethodChain WinObj_chain = { WinObj_methods, NULL };
! 
! static PyObject *WinObj_getattr(WindowObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&WinObj_chain, (PyObject *)self, name);
! }
! 
! #define WinObj_setattr NULL
  
  static int WinObj_compare(WindowObject *self, WindowObject *other)
--- 2927,2931 ----
  };
  
! #define WinObj_getsetlist NULL
  
  static int WinObj_compare(WindowObject *self, WindowObject *other)
***************
*** 2964,2969 ****
  	(destructor) WinObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) WinObj_getattr, /*tp_getattr*/
! 	(setattrfunc) WinObj_setattr, /*tp_setattr*/
  	(cmpfunc) WinObj_compare, /*tp_compare*/
  	(reprfunc) WinObj_repr, /*tp_repr*/
--- 2957,2962 ----
  	(destructor) WinObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) WinObj_compare, /*tp_compare*/
  	(reprfunc) WinObj_repr, /*tp_repr*/
***************
*** 2972,2975 ****
--- 2965,2985 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) WinObj_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*/
+ 	WinObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	WinObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: winsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winsupport.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** winsupport.py	22 Aug 2002 23:30:49 -0000	1.31
--- winsupport.py	29 Nov 2002 23:40:48 -0000	1.32
***************
*** 129,133 ****
  """
  
! class MyObjectDefinition(GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("if (itself == NULL) return PyMac_Error(resNotFound);")
--- 129,133 ----
  """
  
! class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("if (itself == NULL) return PyMac_Error(resNotFound);")