IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5393 from tk0miya/refactor_app

Browse Source 
refactor: Check primary_domain on config-inited event
This commit is contained in:
Takeshi KOMIYA 2018-09-10 20:46:26 +09:00 committed by GitHub
commit c57853923f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/application.py
View File

@ -250,11 +250,6 @@ class Sphinx(object):
self.config.init_values() self.config.init_values()
self.emit('config-inited', self.config) self.emit('config-inited', self.config)
# check primary_domain if requested
primary_domain = self.config.primary_domain
if primary_domain and not self.registry.has_domain(primary_domain):
logger.warning(__('primary_domain %r not found, ignored.'), primary_domain)
# create the builder # create the builder
self.builder = self.create_builder(buildername) self.builder = self.create_builder(buildername)
# set up the build environment # set up the build environment

9
sphinx/config.py
View File

@ -483,12 +483,21 @@ def check_unicode(config):
'Please use Unicode strings, e.g. %r.'), name, u'Content') 'Please use Unicode strings, e.g. %r.'), name, u'Content')
def check_primary_domain(app, config):
# type: (Sphinx, Config) -> None
primary_domain = config.primary_domain
if primary_domain and not app.registry.has_domain(primary_domain):
logger.warning(__('primary_domain %r not found, ignored.'), primary_domain)
config.primary_domain = None # type: ignore
def setup(app): def setup(app):
# type: (Sphinx) -> Dict[unicode, Any] # type: (Sphinx) -> Dict[unicode, Any]
app.connect('config-inited', convert_source_suffix) app.connect('config-inited', convert_source_suffix)
app.connect('config-inited', init_numfig_format) app.connect('config-inited', init_numfig_format)
app.connect('config-inited', correct_copyright_year) app.connect('config-inited', correct_copyright_year)
app.connect('config-inited', check_confval_types) app.connect('config-inited', check_confval_types)
app.connect('config-inited', check_primary_domain)
return { return {
'version': 'builtin', 'version': 'builtin',