From ad0c343d36cbcf950baba9ca3ec8285f0602430e Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Sat, 4 Jan 2025 01:30:03 +0100 Subject: [PATCH] Trim leading whitespace before doctest flags (#13164) --- sphinx/ext/doctest.py | 2 +- tests/test_transforms/test_transforms_post_transforms_code.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py index 462f5ea5e..5d78ebeb2 100644 --- a/sphinx/ext/doctest.py +++ b/sphinx/ext/doctest.py @@ -38,7 +38,7 @@ if TYPE_CHECKING: logger = logging.getLogger(__name__) blankline_re = re.compile(r'^\s*', re.MULTILINE) -doctestopt_re = re.compile(r'#\s*doctest:.+$', re.MULTILINE) +doctestopt_re = re.compile(r'[ \t]*#\s*doctest:.+$', re.MULTILINE) def is_allowed_version(spec: str, version: str) -> bool: diff --git a/tests/test_transforms/test_transforms_post_transforms_code.py b/tests/test_transforms/test_transforms_post_transforms_code.py index a4243fb85..73bfcf49a 100644 --- a/tests/test_transforms/test_transforms_post_transforms_code.py +++ b/tests/test_transforms/test_transforms_post_transforms_code.py @@ -15,6 +15,8 @@ def test_trim_doctest_flags_html(app): assert 'QUUX' not in result assert 'CORGE' not in result assert 'GRAULT' in result + assert 'now() \n' not in result + assert 'now()\n' in result @pytest.mark.sphinx(