summaryrefslogtreecommitdiff
path: root/doc/sphinxext/docscrape.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-02-27 18:34:50 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-02-28 09:02:57 -0700
commitdd13084557f46343b9fac0c02725a826d0ca397b (patch)
tree09f1eaab0ae988fb4e91059224712009d1d29c23 /doc/sphinxext/docscrape.py
parent0934653e151969f6912c911b5113306bd5f450f1 (diff)
downloadnumpy-dd13084557f46343b9fac0c02725a826d0ca397b.tar.gz
2to3: Fix callable.
Diffstat (limited to 'doc/sphinxext/docscrape.py')
-rw-r--r--doc/sphinxext/docscrape.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/sphinxext/docscrape.py b/doc/sphinxext/docscrape.py
index b08643c8b..2348149ac 100644
--- a/doc/sphinxext/docscrape.py
+++ b/doc/sphinxext/docscrape.py
@@ -8,6 +8,7 @@ import re
import pydoc
from StringIO import StringIO
from warnings import warn
+import collections
class Reader(object):
"""A line-based string reader.
@@ -495,7 +496,7 @@ class ClassDoc(NumpyDocString):
return [name for name,func in inspect.getmembers(self._cls)
if ((not name.startswith('_')
or name in self.extra_public_methods)
- and callable(func))]
+ and isinstance(func, collections.Callable))]
@property
def properties(self):