summaryrefslogtreecommitdiff
path: root/sphinx/quickstart.py
diff options
context:
space:
mode:
authorshirou <shirou.faw@gmail.com>2014-09-30 23:02:23 +0900
committershirou <shirou.faw@gmail.com>2014-09-30 23:02:23 +0900
commitcf026c28f74182d4af3d78b0d6261fb61decfc9b (patch)
tree51c9ea7380b62a773f02f51928e1f2f22db50481 /sphinx/quickstart.py
parent57e8b8560e4fd84c6b182789ee4c5d4a57d8de67 (diff)
downloadsphinx-git-cf026c28f74182d4af3d78b0d6261fb61decfc9b.tar.gz
fix overwriting option specified values.
Diffstat (limited to 'sphinx/quickstart.py')
-rw-r--r--sphinx/quickstart.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index eb4877590..45c6ae422 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -1468,11 +1468,11 @@ def main(argv=sys.argv):
if all(['quiet' in d, 'project' in d, 'author' in d,
'version' in d]):
# quiet mode with all required params satisfied, use default
- for k, v in DEFAULT_VALUE.items():
- d[k] = v
- for ext in EXTENSIONS:
- d["ext_"+ext] = False
- d['release'] = d['version']
+ d.setdefault('release', d['version'])
+ d2 = DEFAULT_VALUE.copy()
+ d2.update(dict(("ext_"+ext, False) for ext in EXTENSIONS))
+ d2.update(d)
+ d = d2
else:
ask_user(d)
except (KeyboardInterrupt, EOFError):