From ef236696535877048fdea61df54addb6fb3728f0 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 4 Jan 2021 10:16:46 +0100 Subject: [PATCH] Skip imgconverter availability check if builder supports the image type Close #7973: ImgConverter runs is_available in HTML builder Close missinglinkelectronics/sphinxcontrib-svg2pdfconverter#8: Extension should only run on LaTeX builder --- sphinx/transforms/post_transforms/images.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sphinx/transforms/post_transforms/images.py b/sphinx/transforms/post_transforms/images.py index fb4c3ca2030..2603e0458df 100644 --- a/sphinx/transforms/post_transforms/images.py +++ b/sphinx/transforms/post_transforms/images.py @@ -197,15 +197,15 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def match(self, node: nodes.image) -> bool: if not self.app.builder.supported_image_types: return False + elif set(node['candidates']) & set(self.app.builder.supported_image_types): + # builder supports the image; no need to convert + return False elif self.available is None: # store the value to the class variable to share it during the build self.__class__.available = self.is_available() if not self.available: return False - elif set(node['candidates']) & set(self.app.builder.supported_image_types): - # builder supports the image; no need to convert - return False else: rule = self.get_conversion_rule(node) if rule: