From 6b61a28e628202b90b5da662aba6b887b7056f17 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 1 Oct 2005 16:32:40 +0000 Subject: backport bug [ 729103 ] Cannot retrieve name of super object --- Lib/pydoc.py | 6 +++--- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index f08af90..d370b06 100755 --- 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 47c0ea4..5b63fe0 100644 --- 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. -- cgit v0.12