[Python-checkins] CVS: python/dist/src/Objects descrobject.c,1.1.2.15,1.1.2.16

[Guido van Rossum]

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

Modified Files:
      Tag: descr-branch
	descrobject.c 
Log Message:
Support the __doc__ attribute of wrappers.
SF bug ##446874.


Index: descrobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/Attic/descrobject.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** descrobject.c	2001/07/09 18:47:12	1.1.2.15
--- descrobject.c	2001/08/01 20:30:53	1.1.2.16
***************
*** 312,315 ****
--- 312,330 ----
  };
  
+ static PyObject *
+ wrapper_get_doc(PyWrapperDescrObject *descr, void *closure)
+ {
+ 	if (descr->d_base->doc == NULL) {
+ 		Py_INCREF(Py_None);
+ 		return Py_None;
+ 	}
+ 	return PyString_FromString(descr->d_base->doc);
+ }
+ 
+ static struct getsetlist wrapper_getset[] = {
+ 	{"__doc__", (getter)wrapper_get_doc},
+ 	{0}
+ };
+ 
  static PyTypeObject PyMethodDescr_Type = {
  	PyObject_HEAD_INIT(&PyType_Type)
***************
*** 457,461 ****
  	0,					/* tp_methods */
  	descr_members,				/* tp_members */
! 	0,					/* tp_getset */
  	0,					/* tp_base */
  	0,					/* tp_dict */
--- 472,476 ----
  	0,					/* tp_methods */
  	descr_members,				/* tp_members */
! 	wrapper_getset,				/* tp_getset */
  	0,					/* tp_base */
  	0,					/* tp_dict */