diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-02-27 18:34:50 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 09:02:57 -0700 |
commit | dd13084557f46343b9fac0c02725a826d0ca397b (patch) | |
tree | 09f1eaab0ae988fb4e91059224712009d1d29c23 /doc/sphinxext/docscrape_sphinx.py | |
parent | 0934653e151969f6912c911b5113306bd5f450f1 (diff) | |
download | numpy-dd13084557f46343b9fac0c02725a826d0ca397b.tar.gz |
2to3: Fix callable.
Diffstat (limited to 'doc/sphinxext/docscrape_sphinx.py')
-rw-r--r-- | doc/sphinxext/docscrape_sphinx.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/sphinxext/docscrape_sphinx.py b/doc/sphinxext/docscrape_sphinx.py index e44e770ef..273385475 100644 --- a/doc/sphinxext/docscrape_sphinx.py +++ b/doc/sphinxext/docscrape_sphinx.py @@ -1,6 +1,7 @@ import re, inspect, textwrap, pydoc import sphinx from docscrape import NumpyDocString, FunctionDoc, ClassDoc +import collections class SphinxDocString(NumpyDocString): def __init__(self, docstring, config={}): @@ -212,7 +213,7 @@ def get_doc_object(obj, what=None, doc=None, config={}): what = 'class' elif inspect.ismodule(obj): what = 'module' - elif callable(obj): + elif isinstance(obj, collections.Callable): what = 'function' else: what = 'object' |