diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 282fe15ec98..0cb1c7f861b 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 91507649f61..7de6838af36 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.