From 182b11e68db02cd0de84a80f9830afbdbd35bca8 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Wed, 20 Nov 2019 23:52:19 +0900 Subject: Fix #6848: config.py shouldn't pop extensions from overrides --- sphinx/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sphinx/config.py') 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 -- cgit v1.2.1