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

merge

Browse Source
This commit is contained in:
Georg Brandl 2013-09-16 05:18:04 +02:00
commit 6be087fbe1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/config.py
View File

@ -214,6 +214,8 @@ class Config(object):
self.overrides = overrides self.overrides = overrides
self.values = Config.config_values.copy() self.values = Config.config_values.copy()
config = {} config = {}
if "extensions" in overrides:
config["extensions"] = overrides["extensions"]
if dirname is not None: if dirname is not None:
config_file = path.join(dirname, filename) config_file = path.join(dirname, filename)
config['__file__'] = config_file config['__file__'] = config_file