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:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2019-11-20 17:52:19 +0300
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2019-11-20 17:52:19 +0300
commit182b11e68db02cd0de84a80f9830afbdbd35bca8 (patch)
treee3b02314e7783f70208e994df41d8cd18060741d /sphinx/config.py
parent9f7c7a34db02d737e81d9225b929ead801c4f7e2 (diff)
Fix #6848: config.py shouldn't pop extensions from overrides
Diffstat (limited to 'sphinx/config.py')
-rw-r--r--sphinx/config.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/sphinx/config.py b/sphinx/config.py
index d8cce1b3d..cbe04b3ee 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -177,16 +177,16 @@ class Config:
else:
config, overrides = args[:2]
- self.overrides = overrides
+ self.overrides = dict(overrides)
self.values = Config.config_values.copy()
self._raw_config = config
self.setup = config.get('setup', None) # type: Callable
- if 'extensions' in overrides:
- if isinstance(overrides['extensions'], str):
- config['extensions'] = overrides.pop('extensions').split(',')
+ if 'extensions' in self.overrides:
+ if isinstance(self.overrides['extensions'], str):
+ config['extensions'] = self.overrides.pop('extensions').split(',')
else:
- config['extensions'] = overrides.pop('extensions')
+ config['extensions'] = self.overrides.pop('extensions')
self.extensions = config.get('extensions', []) # type: List[str]
@classmethod