diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-12-22 18:47:30 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-12-22 18:47:30 +0900 |
| commit | 5640cf879f91c8ca5e71b68ab5a5fd24b536703a (patch) | |
| tree | 6fc2107d8adc1ade4f9a8ca260db4e156fdde609 /sphinx/application.py | |
| parent | e83bb29789a093c651a255a509430a03346a5afb (diff) | |
| parent | 43c089fd28dfdc33cc67b364724db51d3f5c1804 (diff) | |
| download | sphinx-git-5640cf879f91c8ca5e71b68ab5a5fd24b536703a.tar.gz | |
Merge branch '2.0'
Diffstat (limited to 'sphinx/application.py')
| -rw-r--r-- | sphinx/application.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sphinx/application.py b/sphinx/application.py index d3d0b07b1..99490cecd 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -78,6 +78,7 @@ builtin_extensions = ( 'sphinx.domains.changeset', 'sphinx.domains.citation', 'sphinx.domains.cpp', + 'sphinx.domains.index', 'sphinx.domains.javascript', 'sphinx.domains.math', 'sphinx.domains.python', @@ -106,7 +107,6 @@ builtin_extensions = ( 'sphinx.environment.collectors.metadata', 'sphinx.environment.collectors.title', 'sphinx.environment.collectors.toctree', - 'sphinx.environment.collectors.indexentries', # 1st party extensions 'sphinxcontrib.applehelp', 'sphinxcontrib.devhelp', @@ -350,8 +350,8 @@ class Sphinx: if self._warncount and self.keep_going: self.statuscode = 1 - status = (self.statuscode == 0 and - __('succeeded') or __('finished with problems')) + status = (__('succeeded') if self.statuscode == 0 + else __('finished with problems')) if self._warncount: if self.warningiserror: msg = __('build %s, %s warning (with warnings treated as errors).', @@ -494,7 +494,7 @@ class Sphinx: logger.debug('[app] adding config value: %r', (name, default, rebuild) + ((types,) if types else ())) # type: ignore if rebuild in (False, True): - rebuild = rebuild and 'env' or '' + rebuild = 'env' if rebuild else '' self.config.add(name, default, rebuild, types) def add_event(self, name): |