Merged revisions 84106 via svnmerge from

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.
........

diff --git a/Lib/doctest.py b/Lib/doctest.py
index c8d5cf4559ce84aa4827276a31556b77e2d1fd65..21b6cc3180c292e69029d76b1e2a6460b3595c30 100644 (file)
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -1786,7 +1786,7 @@ def testmod(m=None, name=None, globs=None, verbose=None,
 
     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
     use m.__name__.

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 55d5316b7cd6027b191a4c45fc8bf914928aec5b..5c7cfb4028bc1eba0bd9bf99854c5fe95c89d2e4 100644 (file)
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -157,7 +157,7 @@ def isgeneratorfunction(object):
 
     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
                 object.__code__.co_flags & CO_GENERATOR)
 

diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index d4a74c8afab2b21f5f92c0fa42f0c8466710595c..ad55f6d9596348985e85583e7b13b733e3ce2037 100644 (file)
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -761,7 +761,7 @@ PyDoc_STRVAR(allocate_doc,
 "allocate_lock() -> lock object\n\
 (allocate() is an obsolete synonym)\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 *
 thread_get_ident(PyObject *self)

diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index f6d36742ef366950efb4f51989d1efbecc0627d9..96275bd50625e4967ba353a908955a4df55576b5 100644 (file)
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -102,7 +102,7 @@ PyDoc_STRVAR(pwd_getpwuid__doc__,
 "getpwuid(uid) -> (pw_name,pw_passwd,pw_uid,\n\
                   pw_gid,pw_gecos,pw_dir,pw_shell)\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 *
 pwd_getpwuid(PyObject *self, PyObject *args)
@@ -123,7 +123,7 @@ PyDoc_STRVAR(pwd_getpwnam__doc__,
 "getpwnam(name) -> (pw_name,pw_passwd,pw_uid,\n\
                     pw_gid,pw_gecos,pw_dir,pw_shell)\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 *
 pwd_getpwnam(PyObject *self, PyObject *args)
@@ -156,7 +156,7 @@ PyDoc_STRVAR(pwd_getpwall__doc__,
 "getpwall() -> list_of_entries\n\
 Return a list of all available password database entries, \
 in arbitrary order.\n\
-See pwd.__doc__ for more on password database entries.");
+See help(pwd) for more on password database entries.");
 
 static PyObject *
 pwd_getpwall(PyObject *self)

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index a94508d32878de467e87ccf73db76dd25442c597..3bf4e908fe44cc31ef2585e275760d6af83bd5f8 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2505,7 +2505,7 @@ static PyMethodDef type_methods[] = {
     {"__instancecheck__", type___instancecheck__, METH_O,
      PyDoc_STR("__instancecheck__() -> check if an object is an instance")},
     {"__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}
 };
 
@@ -5532,7 +5532,7 @@ static slotdef slotdefs[] = {
            wrap_descr_delete, "descr.__delete__(obj)"),
     FLSLOT("__init__", tp_init, slot_tp_init, (wrapperfunc)wrap_init,
            "x.__init__(...) initializes x; "
-           "see x.__class__.__doc__ for signature",
+           "see help(type(x)) for signature",
            PyWrapperFlag_KEYWORDS),
     TPSLOT("__new__", tp_new, slot_tp_new, NULL, ""),
     TPSLOT("__del__", tp_del, slot_tp_del, NULL, ""),