diff options
| author | Georg Brandl <georg@python.org> | 2009-01-10 20:35:16 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-01-10 20:35:16 +0100 |
| commit | beb141c1c79e5c7485f8ffef7eacf9212be3bcc3 (patch) | |
| tree | 86f26d5b65c054047beab5800f2d87c8c7e8aa7f /sphinx/ext/autodoc.py | |
| parent | 45c787144815aef27f5b41f629faaef120e0a589 (diff) | |
| parent | 07c5a8b449ab2fe26eaeaa90717342dd6a947863 (diff) | |
| download | sphinx-git-beb141c1c79e5c7485f8ffef7eacf9212be3bcc3.tar.gz | |
merge in Ben's bundle with more py3k compatibility
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -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 708ab4140..d0512f2be 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 |