From 28a4f0f9659e6f64eee8905b21953e7ba6ff68fa Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Wed, 11 Jun 2003 23:38:55 +0000 Subject: 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 . --- Lib/pydoc.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Lib/pydoc.py') diff --git a/Lib/pydoc.py b/Lib/pydoc.py index a6778d6ac20..fe114fd7828 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): -- cgit v1.2.3