diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-01-10 13:04:23 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-01-10 13:04:23 -0600 |
| commit | d103698d5f6f687094983f678df80c41aac4fac3 (patch) | |
| tree | 193418079f8c375dd536fa41ae9ab0a265361f26 /sphinx/ext | |
| parent | 5f81b007a8cb7a8c0f338b94c626683b24d04ec7 (diff) | |
| download | sphinx-d103698d5f6f687094983f678df80c41aac4fac3.tar.gz | |
use the py3k version of callable()
Diffstat (limited to 'sphinx/ext')
| -rw-r--r-- | sphinx/ext/autodoc.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |
