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

refs #1781: Setting html_domain_indices to a list raises a type check warnings.

Browse Source
This commit is contained in:
shimizukawa 2015-03-17 07:34:26 +09:00
parent 8fb6516256
commit 085bcfa518
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -16,6 +16,7 @@ Bugs fixed
* #1771: automated .mo building doesn't work properly. * #1771: automated .mo building doesn't work properly.
* #1783: Autodoc: Python2 Allow unicode string in __all__. * #1783: Autodoc: Python2 Allow unicode string in __all__.
Thanks to Jens Hedegaard Nielsen. Thanks to Jens Hedegaard Nielsen.
* #1781: Setting `html_domain_indices` to a list raises a type check warnings.
Release 1.3 (released Mar 10, 2015) Release 1.3 (released Mar 10, 2015)
=================================== ===================================

6
sphinx/config.py
View File

@ -28,6 +28,10 @@ if PY3:
CONFIG_EXIT_ERROR = "The configuration file (or one of the modules it imports) " \ CONFIG_EXIT_ERROR = "The configuration file (or one of the modules it imports) " \
"called sys.exit()" "called sys.exit()"
IGNORE_CONFIG_TYPE_CHECKS = (
'html_domain_indices', 'latex_domain_indices', 'texinfo_domain_indices'
)
class Config(object): class Config(object):
""" """
@ -288,6 +292,8 @@ class Config(object):
# NB. since config values might use l_() we have to wait with calling # NB. since config values might use l_() we have to wait with calling
# this method until i18n is initialized # this method until i18n is initialized
for name in self._raw_config: for name in self._raw_config:
if name in IGNORE_CONFIG_TYPE_CHECKS:
continue # for a while, ignore multiple types config value. see #1781
if name not in Config.config_values: if name not in Config.config_values:
continue # we don't know a default value continue # we don't know a default value
default, dummy_rebuild = Config.config_values[name] default, dummy_rebuild = Config.config_values[name]