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

Fix #4720: message when an image is mismatched for builder is not clear

Browse Source
This commit is contained in:
Takeshi KOMIYA
2018-03-17 14:37:50 +09:00
parent d97f41c0e3
commit 39835bf885
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -27,6 +27,7 @@ Bugs fixed
* #4725: Sphinx does not work with python 3.5.0 and 3.5.1 * #4725: Sphinx does not work with python 3.5.0 and 3.5.1
* #4716: Generation PDF file with TexLive on Windows, file not found error * #4716: Generation PDF file with TexLive on Windows, file not found error
* #4574: vertical space before equation in latex * #4574: vertical space before equation in latex
* #4720: message when an image is mismatched for builder is not clear
Testing Testing
-------- --------

11
sphinx/builders/__init__.py
View File

@@ -211,9 +211,14 @@ class Builder(object):
if candidate: if candidate:
break break
else: else:
logger.warning('no matching candidate for image URI %r', mimetypes = sorted(node['candidates'])
images.get_original_image_uri(node['uri']), image_uri = images.get_original_image_uri(node['uri'])
location=node) if mimetypes:
logger.warning('a suitable image for %s builder not found: %s (%s)',
self.name, mimetypes, image_uri, location=node)
else:
logger.warning('a suitable image for %s builder not found: %s',
self.name, image_uri, location=node)
continue continue
node['uri'] = candidate node['uri'] = candidate
else: else:

2
tests/test_build_html.py
View File

@@ -40,7 +40,7 @@ with "\\?": b?'here: >>>(\\\\|/)xbb<<<((\\\\|/)r)?'
HTML_WARNINGS = ENV_WARNINGS + """\ HTML_WARNINGS = ENV_WARNINGS + """\
%(root)s/index.rst:\\d+: WARNING: unknown option: &option %(root)s/index.rst:\\d+: WARNING: unknown option: &option
%(root)s/index.rst:\\d+: WARNING: citation not found: missing %(root)s/index.rst:\\d+: WARNING: citation not found: missing
%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'foo.\\*' %(root)s/index.rst:\\d+: WARNING: a suitable image for html builder not found: foo.\\*
%(root)s/index.rst:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped. %(root)s/index.rst:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped.
""" """

2
tests/test_build_latex.py
View File

@@ -36,7 +36,7 @@ STYLEFILES = ['article.cls', 'fancyhdr.sty', 'titlesec.sty', 'amsmath.sty',
LATEX_WARNINGS = ENV_WARNINGS + """\ LATEX_WARNINGS = ENV_WARNINGS + """\
%(root)s/index.rst:\\d+: WARNING: unknown option: &option %(root)s/index.rst:\\d+: WARNING: unknown option: &option
%(root)s/index.rst:\\d+: WARNING: citation not found: missing %(root)s/index.rst:\\d+: WARNING: citation not found: missing
%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'foo.\\*' %(root)s/index.rst:\\d+: WARNING: a suitable image for latex builder not found: foo.\\*
%(root)s/index.rst:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped. %(root)s/index.rst:\\d+: WARNING: Could not lex literal_block as "c". Highlighting skipped.
""" """

5
tests/test_build_texinfo.py
View File

@@ -25,8 +25,9 @@ from sphinx.writers.texinfo import TexinfoTranslator
TEXINFO_WARNINGS = ENV_WARNINGS + """\ TEXINFO_WARNINGS = ENV_WARNINGS + """\
%(root)s/index.rst:\\d+: WARNING: unknown option: &option %(root)s/index.rst:\\d+: WARNING: unknown option: &option
%(root)s/index.rst:\\d+: WARNING: citation not found: missing %(root)s/index.rst:\\d+: WARNING: citation not found: missing
%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'foo.\\*' %(root)s/index.rst:\\d+: WARNING: a suitable image for texinfo builder not found: foo.\\*
%(root)s/index.rst:\\d+: WARNING: no matching candidate for image URI u'svgimg.\\*' %(root)s/index.rst:\\d+: WARNING: a suitable image for texinfo builder not found: \
\\['application/pdf', 'image/svg\\+xml'\\] \\(svgimg.\\*\\)
""" """
if PY3: if PY3: