summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-01-10 13:04:23 -0600
committerBenjamin Peterson <benjamin@python.org>2009-01-10 13:04:23 -0600
commit07c5a8b449ab2fe26eaeaa90717342dd6a947863 (patch)
tree193418079f8c375dd536fa41ae9ab0a265361f26 /sphinx/ext/autodoc.py
parent5e1711ab21bfcb5ba7a08728400b0c58759b5e0a (diff)
downloadsphinx-git-07c5a8b449ab2fe26eaeaa90717342dd6a947863.tar.gz
use the py3k version of callable()
Diffstat (limited to 'sphinx/ext/autodoc.py')
-rw-r--r--sphinx/ext/autodoc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index be3e3f0ff..417eb555c 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