Fix more doctest failures

tobiasdiez · tobiasdiez · commit 12961cb24d91 · 2025-06-09T16:10:32.000+02:00
diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py
@@ -592,7 +592,7 @@ def parse_marked_output(source: str, want: str) -> str | MarkedOutput:
         # strip_string_literals replaces comments
         comment = literals[comment]
         if random_marker.search(comment):
-            want = MarkedOutput(want).update(random=True)
+            return MarkedOutput(want).update(random=True)
         else:
             m = tolerance_pattern.search(comment)
             if m:
@@ -606,18 +606,25 @@ def parse_marked_output(source: str, want: str) -> str | MarkedOutput:
                     want = MarkedOutput(want).update(abs_tol=epsilon)
                 else:
                     raise RuntimeError
+            else:
+                want = MarkedOutput(want)
 
-    want_32 = ""
-    want_64 = ""
+    want_32 = []
+    want_64 = []
     for line in want.split("\n"):
         bitness = bitness_marker.search(line)
         if bitness:
             if bitness.groups()[0] == "32":
-                want_32 += line[: bitness.start()] + "\n"
+                want_32.append(line[: bitness.start()])
             else:
-                want_64 += line[: bitness.start()] + "\n"
-    if want_32 == "" and want_64 == "":
+                want_64.append(line[: bitness.start()])
+        else:
+            want_32.append(line)
+            want_64.append(line)
+    if want_32 == want_64:
         return want
+    want_32 = "\n".join(want_32)
+    want_64 = "\n".join(want_64)
     return want.update(bitness_32=want_32, bitness_64=want_64)
 
 
diff --git a/src/sage/doctest/parsing_test.py b/src/sage/doctest/parsing_test.py
@@ -137,6 +137,28 @@ def test_parse_bitness_with_tolerance():
     )
 
 
+def test_parse_bitness_multiline():
+    parser = SageDocTestParser(("sage",))
+    input = textwrap.dedent(
+        """
+        sage: sys.maxsize > (1 << 32)
+        something else
+        True # 64-bit
+        False # 32-bit
+        """
+    )
+    parsed = parser.parse(input)[1]
+    assert isinstance(parsed, doctest.Example)
+    assert (
+        parsed.want.bitness_64
+        == MarkedOutput("something else\nTrue # 64-bit\nFalse # 32-bit\n")
+        .update(
+            bitness_32="something else\nFalse \n", bitness_64="something else\nTrue \n"
+        )
+        .bitness_64
+    )
+
+
 def test_check_output_bitness():
     checker = SageOutputChecker()
     expected = MarkedOutput("True # 64-bit\nFalse # 32-bit\n").update(
@@ -155,3 +177,13 @@ def test_check_output_bitness_with_tolerance():
         abs_tol="0.001",
     )
     assert checker.check_output(expected, f"{sys.maxsize} \n", 0)
+
+
+def test_check_output_bitness_multiline():
+    checker = SageOutputChecker()
+    expected = MarkedOutput("something else\nTrue # 64-bit\nFalse # 32-bit\n").update(
+        bitness_32="something else\nFalse \n", bitness_64="something else\nTrue \n"
+    )
+    assert checker.check_output(
+        expected, f"something else\n{bitness_value == 64} \n", 0
+    )
