bug [ 729103 ] Cannot retrieve name of super object

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index e0add862525c8a054ea1e4f0b64772bd3ae2f57f..4084b7e39d6ae8b5e105707b365e8e5f9a266acd 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1079,7 +1079,7 @@ class TextDoc(Doc):
         if data:
             contents = []
             for key, value in data:
-                contents.append(self.docother(value, key, name, 70))
+                contents.append(self.docother(value, key, name, maxlen=70))
             result = result + self.section('DATA', join(contents, '\n'))
 
         if hasattr(object, '__version__'):
@@ -1164,7 +1164,7 @@ class TextDoc(Doc):
                     else:
                         doc = None
                     push(self.docother(getattr(object, name),
-                                       name, mod, 70, doc) + '\n')
+                                       name, mod, maxlen=70, doc=doc) + '\n')
             return attrs
 
         attrs = filter(lambda (name, kind, cls, value): visiblename(name),
@@ -1272,7 +1272,7 @@ class TextDoc(Doc):
         """Produce text documentation for a property."""
         return self._docdescriptor(name, object, mod)
 
-    def docother(self, object, name=None, mod=None, maxlen=None, doc=None):
+    def docother(self, object, name=None, mod=None, parent=None, maxlen=None, doc=None):
         """Produce text documentation for a data object."""
         repr = self.repr(object)
         if maxlen:

diff --git a/Misc/NEWS b/Misc/NEWS
index f4f918c6f404491738ce34d54a19c3be8ed24d50..2c58dae2a8f474e1885cf96c4d7749d1e71f2c63 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -245,6 +245,9 @@ Extension Modules
 Library
 -------
 
+- Bug #729103: pydoc.py: Fix docother() method to accept additional 
+  "parent" argument.
+
 - Patch #1300515: xdrlib.py: Fix pack_fstring() to really use null bytes
   for padding.