mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-18 15:51:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 84106 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84106 | alexander.belopolsky | 2010-08-16 16:17:07 -0400 (Mon, 16 Aug 2010) | 1 line

  Issue #8983: Corrected docstrings.
........
This commit is contained in:
Alexander Belopolsky 2010-08-16 20:30:26 +00:00
parent b35af8c91c
commit b8de9fab30
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/doctest.py
View file

@ -1771,7 +1771,7 @@ def testmod(m=None, name=None, globs=None, verbose=None,
Return (#failures, #tests). Return (#failures, #tests).
See doctest.__doc__ for an overview. See help(doctest) for an overview.
Optional keyword arg "name" gives the name of the module; by default Optional keyword arg "name" gives the name of the module; by default
use m.__name__. use m.__name__.

2
Lib/inspect.py
View file

@ -157,7 +157,7 @@ def isgeneratorfunction(object):
Generator function objects provides same attributes as functions. Generator function objects provides same attributes as functions.
See isfunction.__doc__ for attributes listing.""" See help(isfunction) for attributes listing."""
return bool((isfunction(object) or ismethod(object)) and return bool((isfunction(object) or ismethod(object)) and
object.func_code.co_flags & CO_GENERATOR) object.func_code.co_flags & CO_GENERATOR)

6
Modules/pwdmodule.c
View file

@ -98,7 +98,7 @@ PyDoc_STRVAR(pwd_getpwuid__doc__,
"getpwuid(uid) -> (pw_name,pw_passwd,pw_uid,\n\ "getpwuid(uid) -> (pw_name,pw_passwd,pw_uid,\n\
pw_gid,pw_gecos,pw_dir,pw_shell)\n\ pw_gid,pw_gecos,pw_dir,pw_shell)\n\
Return the password database entry for the given numeric user ID.\n\ Return the password database entry for the given numeric user ID.\n\
See pwd.__doc__ for more on password database entries."); See help(pwd) for more on password database entries.");
static PyObject * static PyObject *
pwd_getpwuid(PyObject *self, PyObject *args) pwd_getpwuid(PyObject *self, PyObject *args)
@ -119,7 +119,7 @@ PyDoc_STRVAR(pwd_getpwnam__doc__,
"getpwnam(name) -> (pw_name,pw_passwd,pw_uid,\n\ "getpwnam(name) -> (pw_name,pw_passwd,pw_uid,\n\
pw_gid,pw_gecos,pw_dir,pw_shell)\n\ pw_gid,pw_gecos,pw_dir,pw_shell)\n\
Return the password database entry for the given user name.\n\ Return the password database entry for the given user name.\n\
See pwd.__doc__ for more on password database entries."); See help(pwd) for more on password database entries.");
static PyObject * static PyObject *
pwd_getpwnam(PyObject *self, PyObject *args) pwd_getpwnam(PyObject *self, PyObject *args)
@ -141,7 +141,7 @@ PyDoc_STRVAR(pwd_getpwall__doc__,
"getpwall() -> list_of_entries\n\ "getpwall() -> list_of_entries\n\
Return a list of all available password database entries, \ Return a list of all available password database entries, \
in arbitrary order.\n\ in arbitrary order.\n\
See pwd.__doc__ for more on password database entries."); See help(pwd) for more on password database entries.");
static PyObject * static PyObject *
pwd_getpwall(PyObject *self) pwd_getpwall(PyObject *self)

2
Modules/threadmodule.c
View file

@ -756,7 +756,7 @@ PyDoc_STRVAR(allocate_doc,
"allocate_lock() -> lock object\n\ "allocate_lock() -> lock object\n\
(allocate() is an obsolete synonym)\n\ (allocate() is an obsolete synonym)\n\
\n\ \n\
Create a new lock object. See LockType.__doc__ for information about locks."); Create a new lock object. See help(LockType) for information about locks.");
static PyObject * static PyObject *
thread_get_ident(PyObject *self) thread_get_ident(PyObject *self)

4
Objects/typeobject.c
View file

@ -2655,7 +2655,7 @@ static PyMethodDef type_methods[] = {
{"__instancecheck__", type___instancecheck__, METH_O, {"__instancecheck__", type___instancecheck__, METH_O,
PyDoc_STR("__instancecheck__() -> check if an object is an instance")}, PyDoc_STR("__instancecheck__() -> check if an object is an instance")},
{"__subclasscheck__", type___subclasscheck__, METH_O, {"__subclasscheck__", type___subclasscheck__, METH_O,
PyDoc_STR("__subclasschck__ -> check if an class is a subclass")}, PyDoc_STR("__subclasscheck__() -> check if a class is a subclass")},
{0} {0}
}; };
@ -6001,7 +6001,7 @@ static slotdef slotdefs[] = {
wrap_descr_delete, "descr.__delete__(obj)"), wrap_descr_delete, "descr.__delete__(obj)"),
FLSLOT("__init__", tp_init, slot_tp_init, (wrapperfunc)wrap_init, FLSLOT("__init__", tp_init, slot_tp_init, (wrapperfunc)wrap_init,
"x.__init__(...) initializes x; " "x.__init__(...) initializes x; "
"see x.__class__.__doc__ for signature", "see help(type(x)) for signature",
PyWrapperFlag_KEYWORDS), PyWrapperFlag_KEYWORDS),
TPSLOT("__new__", tp_new, slot_tp_new, NULL, ""), TPSLOT("__new__", tp_new, slot_tp_new, NULL, ""),
TPSLOT("__del__", tp_del, slot_tp_del, NULL, ""), TPSLOT("__del__", tp_del, slot_tp_del, NULL, ""),