use the py3k version of callable()

2 files changed, 2 insertions, 2 deletions

diff --git a/sphinx/config.py b/sphinx/config.py
index 428c0bf4..e1eb8ec8 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -137,7 +137,7 @@ class Config(object):
         if name not in self.values:
             raise AttributeError('No such config value: %s' % name)
         default = self.values[name][0]
-        if callable(default):
+        if hasattr(default, '__call__'):
             return default(self)
         return default
 
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index be3e3f0f..417eb555 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -166,7 +166,7 @@ def between(marker, what=None, keepempty=False):
 def isdescriptor(x):
     """Check if the object is some kind of descriptor."""
     for item in '__get__', '__set__', '__delete__':
-        if callable(getattr(x, item, None)):
+        if hasattr(getattr(x, item, None), '__call__'):
             return True
     return False