From: Georg Brandl <georg@python.org>
Date: Fri, 3 Dec 2010 09:58:38 +0000 (+0000)
Subject: #10549: fix interface of docclass() for text documenter.
X-Git-Tag: v3.2b1~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bd45f995fa7e79edaf6e79f947de70c22e00168;p=thirdparty%2FPython%2Fcpython.git

#10549: fix interface of docclass() for text documenter.
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 282fe15ec982..0cb1c7f861be 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1132,7 +1132,7 @@ doubt, consult the module reference at the location listed above.
         result = result + self.section('FILE', file)
         return result
 
-    def docclass(self, object, name=None, mod=None):
+    def docclass(self, object, name=None, mod=None, *ignored):
         """Produce text documentation for a given class object."""
         realname = object.__name__
         name = name or realname
diff --git a/Misc/NEWS b/Misc/NEWS
index 91507649f615..7de6838af364 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #10549: Fix pydoc traceback when text-documenting certain classes.
+
 - Issue #2001: New HTML server with enhanced Web page features.  Patch by Ron
   Adam.