fix: Actually prevent HTML re-rendering

Author: pawamoy

src/markdown_exec/pycon.py

@@ -4,6 +4,7 @@
 
 import textwrap
 from typing import Any
+from uuid import uuid4
 
 from markdown.core import Markdown
 
@@ -41,8 +42,13 @@ def format_pycon(  # noqa: WPS231
     python_code = "\n".join(python_lines)
 
     extra = options.get("extra", {})
-    output = run_python(python_code, html, **extra)
+    output = run_python(python_code, **extra)
+    stash = {}
+    if html:
+        placeholder = str(uuid4())
+        stash[placeholder] = output
+        output = placeholder
     if source:
         source_code = textwrap.indent(python_code, ">>> ")
         output = add_source(source=source_code, location=source, output=output, language="pycon", tabs=tabs, **extra)
-    return markdown.convert(output)
+    return markdown.convert(output, stash=stash)

src/markdown_exec/python.py

@@ -6,6 +6,7 @@
 from functools import partial
 from io import StringIO
 from typing import Any
+from uuid import uuid4
 
 from markdown.core import Markdown
 
@@ -24,12 +25,11 @@ def buffer_print(buffer: StringIO, *text: str, end: str = "\n", **kwargs: Any) -
     buffer.write(" ".join(text) + end)
 
 
-def run_python(code: str, html: bool, **extra: str) -> str:
+def run_python(code: str, **extra: str) -> str:
     """Run Python code using `exec` and return its output.
 
     Parameters:
         code: The code to execute.
-        html: Whether the output is HTML.
         **extra: Extra options passed to the traceback code block in case of errors.
 
     Returns:
@@ -46,12 +46,8 @@ def run_python(code: str, html: bool, **extra: str) -> str:
             if frame.filename == "<string>":
                 frame.filename = "<executed code block>"
                 frame._line = code.split("\n")[frame.lineno - 1]  # type: ignore[attr-defined,operator]  # noqa: WPS437
-        output = code_block("python", "".join(trace.format()), **extra)
-    else:
-        output = buffer.getvalue()
-        if html:
-            output = f'<div markdown="0">{str(output)}</div>'
-    return output
+        return code_block("python", "".join(trace.format()), **extra)
+    return buffer.getvalue()
 
 
 def format_python(  # noqa: WPS231
@@ -77,7 +73,12 @@ def format_python(  # noqa: WPS231
     """
     markdown.mimic(md)
     extra = options.get("extra", {})
-    output = run_python(code, html, **extra)
+    output = run_python(code, **extra)
+    stash = {}
+    if html:
+        placeholder = str(uuid4())
+        stash[placeholder] = output
+        output = placeholder
     if source:
         output = add_source(source=code, location=source, output=output, language="python", tabs=tabs, **extra)
-    return markdown.convert(output)
+    return markdown.convert(output, stash=stash)

src/markdown_exec/rendering.py

@@ -132,11 +132,12 @@ def mimic(self, md: Markdown) -> None:
                 priority=4,  # right after 'toc' (needed because that extension adds ids to headers)
             )
 
-    def convert(self, text: str) -> Markup:
+    def convert(self, text: str, stash: dict[str, str] | None = None) -> Markup:
         """Convert Markdown text to safe HTML.
 
         Parameters:
             text: Markdown text.
+            stash: An HTML stash.
 
         Returns:
             Safe HTML.
@@ -145,9 +146,13 @@ def convert(self, text: str) -> Markup:
         self.counter += 1
 
         try:  # noqa: WPS501
-            return Markup(self.md.convert(text))
+            converted = self.md.convert(text)
         finally:
             self.md.treeprocessors[_IdPrependingTreeprocessor.name].id_prefix = ""
+        if stash:
+            for placeholder, stashed in stash.items():
+                converted = converted.replace(placeholder, stashed)
+        return Markup(converted)
 
 
 # provide a singleton

tests/test_python.py

@@ -38,4 +38,4 @@ def test_output_html(md: Markdown) -> None:
             """
         )
     )
-    assert html == '<div markdown="0">**Bold!**\n</div>'
+    assert html == "<p>**Bold!**\n</p>"