Merge pull request #3047 from charris/2to3-callable

2to3: Fix callable.

1 files changed, 2 insertions, 1 deletions

diff --git a/doc/sphinxext/traitsdoc.py b/doc/sphinxext/traitsdoc.py
index 0fcf2c1cd..84753b4e5 100644
--- a/doc/sphinxext/traitsdoc.py
+++ b/doc/sphinxext/traitsdoc.py
@@ -25,6 +25,7 @@ from docscrape_sphinx import SphinxClassDoc, SphinxFunctionDoc, SphinxDocString
 import numpydoc
 
 import comment_eater
+import collections
 
 class SphinxTraitsDoc(SphinxClassDoc):
     def __init__(self, cls, modulename='', func_doc=SphinxFunctionDoc):
@@ -117,7 +118,7 @@ def get_doc_object(obj, what=None, config=None):
             what = 'class'
         elif inspect.ismodule(obj):
             what = 'module'
-        elif callable(obj):
+        elif isinstance(obj, collections.Callable):
             what = 'function'
         else:
             what = 'object'