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

The dirname argument for eval_config_file() is now required

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-03-27 01:33:07 +09:00
parent 2a43b44ec6
commit 7aaa4948f5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/config.py
View File

@ -156,7 +156,10 @@ class Config(object):
'Use Config.read() to read configuration from conf.py.', 'Use Config.read() to read configuration from conf.py.',
RemovedInSphinx30Warning) RemovedInSphinx30Warning)
dirname, filename, overrides, tags = args dirname, filename, overrides, tags = args
config = eval_config_file(dirname, filename, tags) if dirname is None:
config = {}
else:
config = eval_config_file(dirname, filename, tags)
else: else:
# new style arguments: (config={}, overrides={}) # new style arguments: (config={}, overrides={})
if len(args) == 0: if len(args) == 0:
@ -316,9 +319,6 @@ class Config(object):
def eval_config_file(confdir, filename, tags): def eval_config_file(confdir, filename, tags):
# type: (unicode, unicode, Tags) -> Dict[unicode, Any] # type: (unicode, unicode, Tags) -> Dict[unicode, Any]
"""Evaluate a config file.""" """Evaluate a config file."""
if confdir is None:
return {}
config_path = path.join(confdir, filename) config_path = path.join(confdir, filename)
namespace = {} # type: Dict[unicode, Any] namespace = {} # type: Dict[unicode, Any]
namespace['__file__'] = config_path namespace['__file__'] = config_path