diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-11-30 21:52:42 +0900 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-11-30 21:52:42 +0900 |
commit | 15c266c4456816dc5ff2c78880a22aa772b9cd6b (patch) | |
tree | f45910c2053a813e502c354945c0e5df9492f434 /sphinx/config.py | |
parent | 8c7faed6fcbc6b7d40f497698cb80fc10aee1ab3 (diff) | |
parent | 82a6048f1205ee032327e1643d879ef322a2012f (diff) | |
download | sphinx-git-15c266c4456816dc5ff2c78880a22aa772b9cd6b.tar.gz |
Merge branch '2.0'
Diffstat (limited to 'sphinx/config.py')
-rw-r--r-- | sphinx/config.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sphinx/config.py b/sphinx/config.py index 2bf2ae730..691cdac11 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -158,16 +158,16 @@ class Config: def __init__(self, config={}, overrides={}): # type: (Dict[str, Any], Dict[str, Any]) -> None - 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 |