From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 11 Jun 2003 23:38:55 +0000 (+0000)
Subject: Have pydoc try handling an object as "other" if the object does not act the way
X-Git-Tag: v2.3c1~493
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28a4f0f9659e6f64eee8905b21953e7ba6ff68fa;p=python

Have pydoc try handling an object as "other" if the object does not act the way
it expects based on what inspect classifies it as.

Closes bug #729103 .
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index a6778d6ac2..fe114fd782 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -275,9 +275,16 @@ class Doc:
     def document(self, object, name=None, *args):
         """Generate documentation for an object."""
         args = (object, name) + args
-        if inspect.ismodule(object): return self.docmodule(*args)
-        if inspect.isclass(object): return self.docclass(*args)
-        if inspect.isroutine(object): return self.docroutine(*args)
+        # 'try' clause is to attempt to handle the possibility that inspect
+        # identifies something in a way that pydoc itself has issues handling;
+        # think 'super' and how it is a descriptor (which raises the exception
+        # by lacking a __name__ attribute) and an instance.
+        try:
+            if inspect.ismodule(object): return self.docmodule(*args)
+            if inspect.isclass(object): return self.docclass(*args)
+            if inspect.isroutine(object): return self.docroutine(*args)
+        except AttributeError:
+            pass
         return self.docother(*args)
 
     def fail(self, object, name=None, *args):