Fix sphinx-doc#3860: Don't download images when builders not supporte…

…d images
tk0miya · Jun 25, 2017 · 8f8f0fb · 8f8f0fb
1 parent e0a1fed
commit 8f8f0fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -38,6 +38,7 @@ Bugs fixed
 * #3873: Failure of deprecation warning mechanism of
   ``sphinx.util.compat.Directive``
 * #3874: Bogus warnings for "citation not referenced" for cross-file citations
+* #3860: Don't download images when builders not supported images
 
 Testing
 --------

diff --git a/sphinx/transforms/post_transforms/images.py b/sphinx/transforms/post_transforms/images.py
@@ -57,7 +57,9 @@ class ImageDownloader(BaseImageConverter):
 
     def match(self, node):
         # type: (nodes.Node) -> bool
-        if self.app.builder.supported_remote_images:
+        if self.app.builder.supported_image_types == []:
+            return False
+        elif self.app.builder.supported_remote_images:
             return False
         else:
             return '://' in node['uri']
@@ -108,7 +110,9 @@ class DataURIExtractor(BaseImageConverter):
 
     def match(self, node):
         # type: (nodes.Node) -> bool
-        if self.app.builder.supported_data_uri_images:
+        if self.app.builder.supported_remote_images == []:
+            return False
+        elif self.app.builder.supported_data_uri_images is True:
             return False
         else:
             return 'data:' in node['uri']