Close #7108: Allow to show an error message from conf.py via ConfigError

This commit is contained in:
Takeshi KOMIYA
2020-02-10 01:14:45 +09:00
parent 6e0119526a
commit da64e5bdfa
2 changed files with 4 additions and 0 deletions

View File

@@ -48,6 +48,7 @@ Features added
* #3077: Implement the scoping for :rst:dir:`productionlist` as indicated
in the documentation.
* #1027: Support backslash line continuation in :rst:dir:`productionlist`.
* #7108: config: Allow to show an error message from conf.py via ``ConfigError``
Bugs fixed
----------

View File

@@ -324,6 +324,9 @@ def eval_config_file(filename: str, tags: Tags) -> Dict[str, Any]:
msg = __("The configuration file (or one of the modules it imports) "
"called sys.exit()")
raise ConfigError(msg)
except ConfigError:
# pass through ConfigError from conf.py as is. It will be shown in console.
raise
except Exception:
msg = __("There is a programmable error in your configuration file:\n\n%s")
raise ConfigError(msg % traceback.format_exc())