[Python-checkins] python/dist/src/Lib pydoc.py, 1.100.2.4, 1.100.2.5

[birkenfeld@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1642/Lib

Modified Files:
      Tag: release24-maint
	pydoc.py 
Log Message:
backport bug [ 729103 ] Cannot retrieve name of super object



Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.100.2.4
retrieving revision 1.100.2.5
diff -u -d -r1.100.2.4 -r1.100.2.5
--- pydoc.py	22 Jul 2005 21:52:33 -0000	1.100.2.4
+++ pydoc.py	1 Oct 2005 16:32:40 -0000	1.100.2.5
@@ -1078,7 +1078,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__'):
@@ -1163,7 +1163,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),
@@ -1282,7 +1282,7 @@
         """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: