summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-12-03 09:58:38 (GMT)
committerGeorg Brandl <georg@python.org>2010-12-03 09:58:38 (GMT)
commit9bd45f995fa7e79edaf6e79f947de70c22e00168 (patch)
tree35bf37711b0d04ac89cd2f82564fc9bb0ee8ac49
parent34e9fc2e8268b67352e22604d04f85ece008704f (diff)
downloadcpython-9bd45f995fa7e79edaf6e79f947de70c22e00168.zip
cpython-9bd45f995fa7e79edaf6e79f947de70c22e00168.tar.gz
cpython-9bd45f995fa7e79edaf6e79f947de70c22e00168.tar.bz2
#10549: fix interface of docclass() for text documenter.
-rwxr-xr-xLib/pydoc.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 282fe15..0cb1c7f 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 9150764..7de6838 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.