Merge pull request #31 from mshroyer/fixup

Fixup lint and test

Author: rlaboiss

pelican/plugins/graphviz/mdx_graphviz.py

@@ -48,7 +48,9 @@
 
 import base64
 import errno
+import os
 import re
+from subprocess import PIPE, Popen
 import xml.etree.ElementTree as ET
 
 from markdown import Extension
@@ -65,9 +67,6 @@ def __init__(self, errmsg):
 
 def run_graphviz(program, code, options=None, format="png"):
     """Run graphviz program and returns image data."""
-    import os
-    from subprocess import PIPE, Popen
-
     if not options:
         options = []
 
@@ -184,7 +183,12 @@ def run(self, parent, blocks):
                     r"<!-- Title: (.*) Pages: \d+ -->",
                     output.decode("utf-8"),
                 )
-                if m:
+                # Gating against a matched title of "%3" works around an old
+                # graphviz issue, which is still present in the version
+                # shipped with Ubuntu 24.04:
+                #
+                # https://gitlab.com/graphviz/graphviz/-/issues/1376
+                if m and m.group(1) != "%3":
                     img.set("alt", m.group(1))
                 else:
                     img.set("alt", config["alt-text-default"])

pelican/plugins/graphviz/test_graphviz.py

@@ -28,7 +28,10 @@
 
 TEST_FILE_STEM = "test"
 TEST_DIR_PREFIX = "pelicantests."
-GRAPHVIZ_RE = r'<{0} class="{1}"><img alt="{2}" src="data:image/svg\+xml;base64,[0-9a-zA-Z+=]+"></{0}>'
+GRAPHVIZ_RE = (
+    r'<{0} class="{1}"><img alt="{2}" '
+    r'src="data:image/svg\+xml;base64,[0-9a-zA-Z+=]+"></{0}>'
+)
 
 GRAPHVIZ_RE_XML = r'<svg width="\d+pt" height="\d+pt"'
 
@@ -214,24 +217,21 @@ def test_output(self):
         """Test for GRAPHVIZ_IMAGE_CLASS setting."""
         TestGraphviz.test_output(self)
 
-# This test is commented out because it fails in the GitHub action, even
-# though it works fine locally. For some strange reason, the alt property
-# is set to "%3", instead of "foo". This should be investigated further.
-#
-# class TestGraphvizAltTextWithoutID(TestGraphviz):
-#     """Class for testing the case where the Graphviz element has no id."""
-#
-#     def setUp(self):
-#         """Initialize the configuration."""
-#         TestGraphviz.setUp(
-#             self,
-#             digraph_id=None,
-#             alt_text="foo",
-#         )
-#
-#     def test_output(self):
-#         """Test for GRAPHVIZ_IMAGE_CLASS setting."""
-#         TestGraphviz.test_output(self)
+
+class TestGraphvizAltTextWithoutID(TestGraphviz):
+    """Class for testing the case where the Graphviz element has no id."""
+
+    def setUp(self):
+        """Initialize the configuration."""
+        TestGraphviz.setUp(
+            self,
+            digraph_id=None,
+            alt_text="foo",
+        )
+
+    def test_output(self):
+        """Test for GRAPHVIZ_IMAGE_CLASS setting."""
+        TestGraphviz.test_output(self)
 
 
 class TestGraphvizAltTextViaOption(TestGraphviz):