bug [ 729103 ] Cannot retrieve name of super object
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index e0add86..4084b7e 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1079,7 +1079,7 @@
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 @@
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 @@
"""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 f4f918c..2c58dae 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -245,6 +245,9 @@
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.