IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Closes #1949: Use `safe_getattr` in the coverage builder to avoid aborting with descriptors that have custom behavior.

Browse Source
This commit is contained in:
Georg Brandl 2015-07-25 09:32:52 +02:00
parent 21188120cc
commit ae7e3afb4f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -30,6 +30,8 @@ Bugs fixed
Hirai. Hirai.
* #1871: Fix for LaTeX output of tables with one column and multirows. * #1871: Fix for LaTeX output of tables with one column and multirows.
* Work around the lack of the HTMLParserError exception in Python 3.5. * Work around the lack of the HTMLParserError exception in Python 3.5.
* #1949: Use ``safe_getattr`` in the coverage builder to avoid aborting with
descriptors that have custom behavior.
Release 1.3.1 (released Mar 17, 2015) Release 1.3.1 (released Mar 17, 2015)

6
sphinx/ext/coverage.py
View File

@ -20,6 +20,7 @@ from six.moves import cPickle as pickle
import sphinx import sphinx
from sphinx.builders import Builder from sphinx.builders import Builder
from sphinx.util.inspect import safe_getattr
# utility # utility
@ -187,7 +188,10 @@ class CoverageBuilder(Builder):
for attr_name in dir(obj): for attr_name in dir(obj):
if attr_name not in obj.__dict__: if attr_name not in obj.__dict__:
continue continue
attr = getattr(obj, attr_name) try:
attr = safe_getattr(obj, attr_name)
except AttributeError:
continue
if not (inspect.ismethod(attr) or if not (inspect.ismethod(attr) or
inspect.isfunction(attr)): inspect.isfunction(attr)):
continue continue