[Python-checkins] python/dist/src/Mac/Modules/dlg _Dlgmodule.c,1.11,1.12 dlgsupport.py,1.28,1.29

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Dlgmodule.c dlgsupport.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: _Dlgmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/dlg/_Dlgmodule.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** _Dlgmodule.c	16 Aug 2002 09:09:20 -0000	1.11
--- _Dlgmodule.c	29 Nov 2002 23:40:42 -0000	1.12
***************
*** 965,976 ****
  };
  
! PyMethodChain DlgObj_chain = { DlgObj_methods, NULL };
! 
! static PyObject *DlgObj_getattr(DialogObject *self, char *name)
! {
! 	return Py_FindMethodInChain(&DlgObj_chain, (PyObject *)self, name);
! }
! 
! #define DlgObj_setattr NULL
  
  static int DlgObj_compare(DialogObject *self, DialogObject *other)
--- 965,969 ----
  };
  
! #define DlgObj_getsetlist NULL
  
  static int DlgObj_compare(DialogObject *self, DialogObject *other)
***************
*** 997,1002 ****
  	(destructor) DlgObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc) DlgObj_getattr, /*tp_getattr*/
! 	(setattrfunc) DlgObj_setattr, /*tp_setattr*/
  	(cmpfunc) DlgObj_compare, /*tp_compare*/
  	(reprfunc) DlgObj_repr, /*tp_repr*/
--- 990,995 ----
  	(destructor) DlgObj_dealloc, /*tp_dealloc*/
  	0, /*tp_print*/
! 	(getattrfunc)0, /*tp_getattr*/
! 	(setattrfunc)0, /*tp_setattr*/
  	(cmpfunc) DlgObj_compare, /*tp_compare*/
  	(reprfunc) DlgObj_repr, /*tp_repr*/
***************
*** 1005,1008 ****
--- 998,1018 ----
  	(PyMappingMethods *)0, /* tp_as_mapping */
  	(hashfunc) DlgObj_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*/
+ 	DlgObj_methods, /* tp_methods */
+ 	0, /*outputHook_tp_members*/
+ 	DlgObj_getsetlist, /*tp_getset*/
+ 	0, /*outputHook_tp_base*/
  };
  

Index: dlgsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/dlg/dlgsupport.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** dlgsupport.py	16 Dec 2001 20:18:01 -0000	1.28
--- dlgsupport.py	29 Nov 2002 23:40:42 -0000	1.29
***************
*** 202,206 ****
  
  # Define a class which specializes our object definition
! class MyObjectDefinition(GlobalObjectDefinition):
  	def __init__(self, name, prefix = None, itselftype = None):
  		GlobalObjectDefinition.__init__(self, name, prefix, itselftype)
--- 202,206 ----
  
  # Define a class which specializes our object definition
! class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	def __init__(self, name, prefix = None, itselftype = None):
  		GlobalObjectDefinition.__init__(self, name, prefix, itselftype)