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/numpydoc.py | |
| parent | 0934653e151969f6912c911b5113306bd5f450f1 (diff) | |
| download | numpy-dd13084557f46343b9fac0c02725a826d0ca397b.tar.gz | |
2to3: Fix callable.
Diffstat (limited to 'doc/sphinxext/numpydoc.py')
| -rw-r--r-- | doc/sphinxext/numpydoc.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/sphinxext/numpydoc.py b/doc/sphinxext/numpydoc.py index 7679352c2..dd0c59b8d 100644 --- a/doc/sphinxext/numpydoc.py +++ b/doc/sphinxext/numpydoc.py @@ -17,6 +17,7 @@ It will: """ import sphinx +import collections if sphinx.__version__ < '1.0.1': raise RuntimeError("Sphinx 1.0.1 or newer is required") @@ -82,7 +83,7 @@ def mangle_signature(app, what, name, obj, options, sig, retann): 'initializes x; see ' in pydoc.getdoc(obj.__init__))): return '', '' - if not (callable(obj) or hasattr(obj, '__argspec_is_invalid_')): return + if not (isinstance(obj, collections.Callable) or hasattr(obj, '__argspec_is_invalid_')): return if not hasattr(obj, '__doc__'): return doc = SphinxDocString(pydoc.getdoc(obj)) |