Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bug [ 729103 ] Cannot retrieve name of super object

This commit is contained in:
Georg Brandl 2005-10-01 16:32:31 +00:00
parent ce7da6c5e9
commit 8b813db2ef
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/pydoc.py
View File

@ -1079,7 +1079,7 @@ class TextDoc(Doc):
if data: if data:
contents = [] contents = []
for key, value in data: 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')) result = result + self.section('DATA', join(contents, '\n'))
if hasattr(object, '__version__'): if hasattr(object, '__version__'):
@ -1164,7 +1164,7 @@ class TextDoc(Doc):
else: else:
doc = None doc = None
push(self.docother(getattr(object, name), push(self.docother(getattr(object, name),
name, mod, 70, doc) + '\n') name, mod, maxlen=70, doc=doc) + '\n')
return attrs return attrs
attrs = filter(lambda (name, kind, cls, value): visiblename(name), attrs = filter(lambda (name, kind, cls, value): visiblename(name),
@ -1272,7 +1272,7 @@ class TextDoc(Doc):
"""Produce text documentation for a property.""" """Produce text documentation for a property."""
return self._docdescriptor(name, object, mod) 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.""" """Produce text documentation for a data object."""
repr = self.repr(object) repr = self.repr(object)
if maxlen: if maxlen:

3
Misc/NEWS
View File

@ -245,6 +245,9 @@ Extension Modules
Library 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 - Patch #1300515: xdrlib.py: Fix pack_fstring() to really use null bytes
for padding. for padding.