Remove section_parents (#13560)

Docutils revision r10129 [1] removes the member from the namespace.

[1]: https://sourceforge.net/p/docutils/code/10129/

Author: AA-Turner

sphinx/directives/other.py

@@ -5,7 +5,6 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, cast
 
-import docutils
 from docutils import nodes
 from docutils.parsers.rst import directives
 from docutils.parsers.rst.directives.misc import Class
@@ -22,15 +21,14 @@
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from typing import Any, ClassVar, Final
+    from typing import Any, ClassVar
 
     from docutils.nodes import Element, Node
 
     from sphinx.application import Sphinx
     from sphinx.util.typing import ExtensionMetadata, OptionSpec
 
 
-DU_22_PLUS: Final = docutils.__version_info__ >= (0, 22, 0, 'alpha', 0)
 glob_re = re.compile(r'.*[*?\[].*')
 logger = logging.getLogger(__name__)
 
@@ -332,14 +330,6 @@ def run(self) -> list[Node]:
         surrounding_section_level = memo.section_level
         memo.title_styles = []
         memo.section_level = 0
-        if DU_22_PLUS:
-            # https://github.com/sphinx-doc/sphinx/issues/13539
-            # https://sourceforge.net/p/docutils/code/10093/
-            # https://sourceforge.net/p/docutils/patches/213/
-            surrounding_section_parents = memo.section_parents
-            memo.section_parents = []
-        else:
-            surrounding_section_parents = []
         try:
             self.state.nested_parse(
                 self.content, self.content_offset, node, match_titles=True
@@ -375,8 +365,6 @@ def run(self) -> list[Node]:
             return []
         finally:
             memo.title_styles = surrounding_title_styles
-            if DU_22_PLUS:
-                memo.section_parents = surrounding_section_parents
             memo.section_level = surrounding_section_level
 
 

sphinx/util/parsing.py

@@ -5,19 +5,15 @@
 import contextlib
 from typing import TYPE_CHECKING
 
-import docutils
 from docutils.nodes import Element
 from docutils.statemachine import StringList, string2lines
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
-    from typing import Final
 
     from docutils.nodes import Node
     from docutils.parsers.rst.states import RSTState
 
-DU_22_PLUS: Final = docutils.__version_info__ >= (0, 22, 0, 'alpha', 0)
-
 
 def nested_parse_to_nodes(
     state: RSTState,
@@ -79,23 +75,15 @@ def _fresh_title_style_context(state: RSTState) -> Iterator[None]:
     memo = state.memo
     surrounding_title_styles: list[str | tuple[str, str]] = memo.title_styles
     surrounding_section_level: int = memo.section_level
-    if DU_22_PLUS:
-        surrounding_section_parents = memo.section_parents
-    else:
-        surrounding_section_parents = []
     # clear current title styles
     memo.title_styles = []
     memo.section_level = 0
-    if DU_22_PLUS:
-        memo.section_parents = []
     try:
         yield
     finally:
         # reset title styles
         memo.title_styles = surrounding_title_styles
         memo.section_level = surrounding_section_level
-        if DU_22_PLUS:
-            memo.section_parents = surrounding_section_parents
 
 
 def _text_to_string_list(

tests/test_util/test_util_docutils_sphinx_directive.py

@@ -2,7 +2,6 @@
 
 from types import SimpleNamespace
 
-import docutils
 from docutils import nodes
 from docutils.parsers.rst.languages import en as english  # type: ignore[attr-defined]
 from docutils.parsers.rst.states import (
@@ -45,16 +44,10 @@ def make_directive_and_state(
         reporter=document.reporter,
         language=english,
         title_styles=[],
-        # section_parents=[],  # Docutils 0.22+
         section_level=0,
         section_bubble_up_kludge=False,
         inliner=inliner,
     )
-    if docutils.__version_info__ >= (0, 22, 0, 'alpha', 0):
-        # https://github.com/sphinx-doc/sphinx/issues/13539
-        # https://sourceforge.net/p/docutils/code/10093/
-        # https://sourceforge.net/p/docutils/patches/213/
-        state.memo.section_parents = []
     directive = SphinxDirective(
         name='test_directive',
         arguments=[],