backport bug [ 729103 ] Cannot retrieve name of super object

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index f08af906553ee1e19c1ad55aed89853946e027ad..d370b06f37333779e54cfc702aed19ae9ce75304 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1078,7 +1078,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__'):
@@ -1163,7 +1163,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),
@@ -1282,7 +1282,7 @@ class TextDoc(Doc):
         """Produce text documentation for a property."""
         return self._docproperty(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 47c0ea49fd75982487e9a3727743ad39f87f185e..5b63fe0008afde8b8cc21731cd8469cd3f527531 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,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.