Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/sphinx-doc/sphinx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2015-01-17 10:01:53 +0300
committershimizukawa <shimizukawa@gmail.com>2015-01-17 10:01:53 +0300
commit3c872e66a4e2482eb3888052194c22562ee011a8 (patch)
tree8f9f23284890d6a25131ba40d14ea866aeba129a /sphinx/ext/ifconfig.py
parent28683a36c4a128e602f35622bb3b0fb56d52f313 (diff)
Fixes #1686: ifconfig directive doesn't care about default config values.
Diffstat (limited to 'sphinx/ext/ifconfig.py')
-rw-r--r--sphinx/ext/ifconfig.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/ext/ifconfig.py b/sphinx/ext/ifconfig.py
index 195783755..a675b9796 100644
--- a/sphinx/ext/ifconfig.py
+++ b/sphinx/ext/ifconfig.py
@@ -48,7 +48,8 @@ class IfConfig(Directive):
def process_ifconfig_nodes(app, doctree, docname):
- ns = app.config.__dict__.copy()
+ ns = {k: app.config[k] for k in app.config.values}
+ ns.update(app.config.__dict__.copy())
ns['builder'] = app.builder.name
for node in doctree.traverse(ifconfig):
try: