[Python-checkins] r84108 - in python/branches/release27-maint: Lib/doctest.py Lib/inspect.py Modules/pwdmodule.c Modules/threadmodule.c Objects/typeobject.c

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Mon Aug 16 22:30:26 2010
New Revision: 84108

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/doctest.py
   python/branches/release27-maint/Lib/inspect.py
   python/branches/release27-maint/Modules/pwdmodule.c
   python/branches/release27-maint/Modules/threadmodule.c
   python/branches/release27-maint/Objects/typeobject.c

Modified: python/branches/release27-maint/Lib/doctest.py
==============================================================================
--- python/branches/release27-maint/Lib/doctest.py	(original)
+++ python/branches/release27-maint/Lib/doctest.py	Mon Aug 16 22:30:26 2010
@@ -1771,7 +1771,7 @@
 
     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__.

Modified: python/branches/release27-maint/Lib/inspect.py
==============================================================================
--- python/branches/release27-maint/Lib/inspect.py	(original)
+++ python/branches/release27-maint/Lib/inspect.py	Mon Aug 16 22:30:26 2010
@@ -157,7 +157,7 @@
 
     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.func_code.co_flags & CO_GENERATOR)
 

Modified: python/branches/release27-maint/Modules/pwdmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/pwdmodule.c	(original)
+++ python/branches/release27-maint/Modules/pwdmodule.c	Mon Aug 16 22:30:26 2010
@@ -98,7 +98,7 @@
 "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)
@@ -119,7 +119,7 @@
 "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)
@@ -141,7 +141,7 @@
 "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)

Modified: python/branches/release27-maint/Modules/threadmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/threadmodule.c	(original)
+++ python/branches/release27-maint/Modules/threadmodule.c	Mon Aug 16 22:30:26 2010
@@ -756,7 +756,7 @@
 "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)

Modified: python/branches/release27-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release27-maint/Objects/typeobject.c	(original)
+++ python/branches/release27-maint/Objects/typeobject.c	Mon Aug 16 22:30:26 2010
@@ -2655,7 +2655,7 @@
     {"__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}
 };
 
@@ -6001,7 +6001,7 @@
            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, ""),