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

Simplify `logger.error calls in validate_intersphinx_mapping` (#12644)

Browse Source
This commit is contained in:
Bénédikt Tran
2024-07-22 15:41:31 +02:00
committed by GitHub
parent e174df2762
commit 8c6d234e96
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sphinx/ext/intersphinx/_load.py
View File

@@ -52,22 +52,13 @@ def validate_intersphinx_mapping(app: Sphinx, config: Config) -> None:
errors = 0 errors = 0
for name, value in config.intersphinx_mapping.copy().items(): for name, value in config.intersphinx_mapping.copy().items():
# ensure that intersphinx projects are always named # ensure that intersphinx projects are always named
if not isinstance(name, str): if not isinstance(name, str) or not name:
errors += 1 errors += 1
msg = __( msg = __(
'Invalid intersphinx project identifier `%r` in intersphinx_mapping. ' 'Invalid intersphinx project identifier `%r` in intersphinx_mapping. '
'Project identifiers must be non-empty strings.' 'Project identifiers must be non-empty strings.'
) )
LOGGER.error(msg % name) LOGGER.error(msg, name)
del config.intersphinx_mapping[name]
continue
if not name:
errors += 1
msg = __(
'Invalid intersphinx project identifier `%r` in intersphinx_mapping. '
'Project identifiers must be non-empty strings.'
)
LOGGER.error(msg % name)
del config.intersphinx_mapping[name] del config.intersphinx_mapping[name]
continue continue
@@ -78,7 +69,7 @@ def validate_intersphinx_mapping(app: Sphinx, config: Config) -> None:
'Invalid value `%r` in intersphinx_mapping[%r]. ' 'Invalid value `%r` in intersphinx_mapping[%r]. '
'Expected a two-element tuple or list.' 'Expected a two-element tuple or list.'
) )
LOGGER.error(msg % (value, name)) LOGGER.error(msg, value, name)
del config.intersphinx_mapping[name] del config.intersphinx_mapping[name]
continue continue
try: try:
@@ -89,7 +80,7 @@ def validate_intersphinx_mapping(app: Sphinx, config: Config) -> None:
'Invalid value `%r` in intersphinx_mapping[%r]. ' 'Invalid value `%r` in intersphinx_mapping[%r]. '
'Values must be a (target URI, inventory locations) pair.' 'Values must be a (target URI, inventory locations) pair.'
) )
LOGGER.error(msg % (value, name)) LOGGER.error(msg, value, name)
del config.intersphinx_mapping[name] del config.intersphinx_mapping[name]
continue continue
@@ -98,7 +89,7 @@ def validate_intersphinx_mapping(app: Sphinx, config: Config) -> None:
errors += 1 errors += 1
msg = __('Invalid target URI value `%r` in intersphinx_mapping[%r][0]. ' msg = __('Invalid target URI value `%r` in intersphinx_mapping[%r][0]. '
'Target URIs must be unique non-empty strings.') 'Target URIs must be unique non-empty strings.')
LOGGER.error(msg % (uri, name)) LOGGER.error(msg, uri, name)
del config.intersphinx_mapping[name] del config.intersphinx_mapping[name]
continue continue
if uri in seen: if uri in seen:
@@ -107,7 +98,7 @@ def validate_intersphinx_mapping(app: Sphinx, config: Config) -> None:
'Invalid target URI value `%r` in intersphinx_mapping[%r][0]. ' 'Invalid target URI value `%r` in intersphinx_mapping[%r][0]. '
'Target URIs must be unique (other instance in intersphinx_mapping[%r]).' 'Target URIs must be unique (other instance in intersphinx_mapping[%r]).'
) )
LOGGER.error(msg % (uri, name, seen[uri])) LOGGER.error(msg, uri, name, seen[uri])
del config.intersphinx_mapping[name] del config.intersphinx_mapping[name]
continue continue
seen[uri] = name seen[uri] = name
@@ -123,7 +114,7 @@ def validate_intersphinx_mapping(app: Sphinx, config: Config) -> None:
'Invalid inventory location value `%r` in intersphinx_mapping[%r][1]. ' 'Invalid inventory location value `%r` in intersphinx_mapping[%r][1]. '
'Inventory locations must be non-empty strings or None.' 'Inventory locations must be non-empty strings or None.'
) )
LOGGER.error(msg % (target, name)) LOGGER.error(msg, target, name)
del config.intersphinx_mapping[name] del config.intersphinx_mapping[name]
continue continue