[Python-checkins] python/dist/src/Objects typeobject.c,2.175,2.176 descrobject.c,2.27,2.28

nnorwitz@users.sourceforge.net nnorwitz@users.sourceforge.net
Tue, 13 Aug 2002 15:19:16 -0700


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

Modified Files:
	typeobject.c descrobject.c 
Log Message:
Allow more docstrings to be removed during compilation

Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.175
retrieving revision 2.176
diff -C2 -d -r2.175 -r2.176
*** typeobject.c	13 Aug 2002 19:01:38 -0000	2.175
--- typeobject.c	13 Aug 2002 22:19:12 -0000	2.176
***************
*** 1578,1584 ****
  static PyMethodDef type_methods[] = {
  	{"mro", (PyCFunction)mro_external, METH_NOARGS,
! 	 "mro() -> list\nreturn a type's method resolution order"},
  	{"__subclasses__", (PyCFunction)type_subclasses, METH_NOARGS,
! 	 "__subclasses__() -> list of immediate subclasses"},
  	{0}
  };
--- 1578,1584 ----
  static PyMethodDef type_methods[] = {
  	{"mro", (PyCFunction)mro_external, METH_NOARGS,
! 	 PyDoc_STR("mro() -> list\nreturn a type's method resolution order")},
  	{"__subclasses__", (PyCFunction)type_subclasses, METH_NOARGS,
! 	 PyDoc_STR("__subclasses__() -> list of immediate subclasses")},
  	{0}
  };
***************
*** 1904,1908 ****
  
  static PyMethodDef object_methods[] = {
! 	{"__reduce__", object_reduce, METH_NOARGS, "helper for pickle"},
  	{0}
  };
--- 1904,1909 ----
  
  static PyMethodDef object_methods[] = {
! 	{"__reduce__", object_reduce, METH_NOARGS, 
! 	 PyDoc_STR("helper for pickle")},
  	{0}
  };
***************
*** 1930,1934 ****
  	0,					/* tp_as_buffer */
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
! 	"The most base type",			/* tp_doc */
  	0,					/* tp_traverse */
  	0,					/* tp_clear */
--- 1931,1935 ----
  	0,					/* tp_as_buffer */
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
! 	PyDoc_STR("The most base type"),	/* tp_doc */
  	0,					/* tp_traverse */
  	0,					/* tp_clear */
***************
*** 2977,2981 ****
  static struct PyMethodDef tp_new_methoddef[] = {
  	{"__new__", (PyCFunction)tp_new_wrapper, METH_KEYWORDS,
! 	 "T.__new__(S, ...) -> a new object with type S, a subtype of T"},
  	{0}
  };
--- 2978,2983 ----
  static struct PyMethodDef tp_new_methoddef[] = {
  	{"__new__", (PyCFunction)tp_new_wrapper, METH_KEYWORDS,
! 	 PyDoc_STR("T.__new__(S, ...) -> "
! 	 	   "a new object with type S, a subtype of T")},
  	{0}
  };

Index: descrobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/descrobject.c,v
retrieving revision 2.27
retrieving revision 2.28
diff -C2 -d -r2.27 -r2.28
*** descrobject.c	14 Jun 2002 20:41:15 -0000	2.27
--- descrobject.c	13 Aug 2002 22:19:13 -0000	2.28
***************
*** 669,689 ****
  static PyMethodDef proxy_methods[] = {
  	{"has_key",   (PyCFunction)proxy_has_key,    METH_O,
! 	 "D.has_key(k) -> 1 if D has a key k, else 0"},
  	{"get",       (PyCFunction)proxy_get,        METH_VARARGS,
! 	 "D.get(k[,d]) -> D[k] if D.has_key(k), else d.  d defaults to None."},
  	{"keys",      (PyCFunction)proxy_keys,       METH_NOARGS,
! 	 "D.keys() -> list of D's keys"},
  	{"values",    (PyCFunction)proxy_values,     METH_NOARGS,
! 	 "D.values() -> list of D's values"},
  	{"items",     (PyCFunction)proxy_items,      METH_NOARGS,
! 	 "D.items() -> list of D's (key, value) pairs, as 2-tuples"},
  	{"iterkeys",  (PyCFunction)proxy_iterkeys,   METH_NOARGS,
! 	 "D.iterkeys() -> an iterator over the keys of D"},
  	{"itervalues",(PyCFunction)proxy_itervalues, METH_NOARGS,
! 	 "D.itervalues() -> an iterator over the values of D"},
  	{"iteritems", (PyCFunction)proxy_iteritems,  METH_NOARGS,
! 	 "D.iteritems() -> an iterator over the (key, value) items of D"},
  	{"copy",      (PyCFunction)proxy_copy,       METH_NOARGS,
! 	 "D.copy() -> a shallow copy of D"},
  	{0}
  };
--- 669,691 ----
  static PyMethodDef proxy_methods[] = {
  	{"has_key",   (PyCFunction)proxy_has_key,    METH_O,
! 	 PyDoc_STR("D.has_key(k) -> 1 if D has a key k, else 0")},
  	{"get",       (PyCFunction)proxy_get,        METH_VARARGS,
! 	 PyDoc_STR("D.get(k[,d]) -> D[k] if D.has_key(k), else d."
! 	 				"  d defaults to None.")},
  	{"keys",      (PyCFunction)proxy_keys,       METH_NOARGS,
! 	 PyDoc_STR("D.keys() -> list of D's keys")},
  	{"values",    (PyCFunction)proxy_values,     METH_NOARGS,
! 	 PyDoc_STR("D.values() -> list of D's values")},
  	{"items",     (PyCFunction)proxy_items,      METH_NOARGS,
! 	 PyDoc_STR("D.items() -> list of D's (key, value) pairs, as 2-tuples")},
  	{"iterkeys",  (PyCFunction)proxy_iterkeys,   METH_NOARGS,
! 	 PyDoc_STR("D.iterkeys() -> an iterator over the keys of D")},
  	{"itervalues",(PyCFunction)proxy_itervalues, METH_NOARGS,
! 	 PyDoc_STR("D.itervalues() -> an iterator over the values of D")},
  	{"iteritems", (PyCFunction)proxy_iteritems,  METH_NOARGS,
! 	 PyDoc_STR("D.iteritems() ->"
! 	 	   " an iterator over the (key, value) items of D")},
  	{"copy",      (PyCFunction)proxy_copy,       METH_NOARGS,
! 	 PyDoc_STR("D.copy() -> a shallow copy of D")},
  	{0}
  };