[Python-checkins] CVS: python/dist/src/Include object.h,2.79.2.22,2.79.2.23

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv16653/Include

Modified Files:
      Tag: descr-branch
	object.h 
Log Message:
Change the descrgetfunc signature: the thir argument is now an
arbitrary object.  This is needed so that classmethod() can also be
used for classic classes.

This is *almost* just a metter of changing casts that don't cause
different code to be generated; the exception is wrap_descr_get which
also removes a typecheck from the PyArg_ParseTuple() argument list.



Index: object.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/object.h,v
retrieving revision 2.79.2.22
retrieving revision 2.79.2.23
diff -C2 -r2.79.2.22 -r2.79.2.23
*** object.h	2001/07/03 00:37:47	2.79.2.22
--- object.h	2001/07/03 00:48:14	2.79.2.23
***************
*** 203,208 ****
  typedef PyObject *(*getiterfunc) (PyObject *);
  typedef PyObject *(*iternextfunc) (PyObject *);
! typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *,
! 				   struct _typeobject *);
  typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
  typedef int (*initproc)(PyObject *, PyObject *, PyObject *);
--- 203,207 ----
  typedef PyObject *(*getiterfunc) (PyObject *);
  typedef PyObject *(*iternextfunc) (PyObject *);
! typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *);
  typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
  typedef int (*initproc)(PyObject *, PyObject *, PyObject *);