diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-11-20 23:52:19 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-11-20 23:52:19 +0900 |
| commit | 182b11e68db02cd0de84a80f9830afbdbd35bca8 (patch) | |
| tree | e3b02314e7783f70208e994df41d8cd18060741d | |
| parent | 9f7c7a34db02d737e81d9225b929ead801c4f7e2 (diff) | |
| download | sphinx-git-182b11e68db02cd0de84a80f9830afbdbd35bca8.tar.gz | |
Fix #6848: config.py shouldn't pop extensions from overrides
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | sphinx/config.py | 10 |
2 files changed, 6 insertions, 5 deletions
@@ -67,6 +67,7 @@ Bugs fixed * #6793: texinfo: Code examples broken following "sidebar" * #6813: An orphan warning is emitted for included document on Windows. Thanks to @drillan +* #6848: config.py shouldn't pop extensions from overrides Testing -------- 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 |