From 959d0b92c9f8c4ab5b2af5a27b9979051e400a53 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 25 Jun 2017 18:52:12 +0900 Subject: [PATCH] Show correct URI if image candidate not found --- sphinx/builders/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index fdf524bf6..007964e82 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -22,6 +22,7 @@ from six import itervalues from docutils import nodes from sphinx.deprecation import RemovedInSphinx20Warning +from sphinx.environment.adapters.asset import ImageAdapter from sphinx.util import i18n, path_stabilize, logging, status_iterator from sphinx.util.osutil import SEP, relative_uri from sphinx.util.i18n import find_catalog @@ -200,6 +201,7 @@ class Builder(object): def post_process_images(self, doctree): # type: (nodes.Node) -> None """Pick the best candidate for all image URIs.""" + images = ImageAdapter(self.env) for node in doctree.traverse(nodes.image): if '?' in node['candidates']: # don't rewrite nonlocal image URIs @@ -210,7 +212,8 @@ class Builder(object): if candidate: break else: - logger.warning('no matching candidate for image URI %r', node['uri'], + logger.warning('no matching candidate for image URI %r', + images.get_original_image_uri(node['uri']), location=node) continue node['uri'] = candidate