From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:41:25 +0000 (+0100)
Subject: [3.12] Revert "Doc: Show object descriptions in the table of contents (GH-125757... 
X-Git-Tag: v3.12.9~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52c08ed02974c47596c00adbbb4087bd6d587c1c;p=thirdparty%2FPython%2Fcpython.git

[3.12] Revert "Doc: Show object descriptions in the table of contents (GH-125757)" (GH-128406) (#128414)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---

diff --git a/Doc/conf.py b/Doc/conf.py
index 4e76c21fe0c6..4b18d02a943f 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -89,9 +89,7 @@ needs_sphinx = '7.2.6'
 
 # Create table of contents entries for domain objects (e.g. functions, classes,
 # attributes, etc.). Default is True.
-toc_object_entries = True
-# Hide parents to tidy up long entries in sidebar
-toc_object_entries_show_parents = 'hide'
+toc_object_entries = False
 
 # Ignore any .rst files in the includes/ directory;
 # they're embedded in pages but not rendered as individual pages.
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
index 615c7f1f30fc..f09574d1ad34 100644
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -435,6 +435,5 @@ def setup(app):
     app.add_directive_to_domain('py', 'awaitablemethod', PyAwaitableMethod)
     app.add_directive_to_domain('py', 'abstractmethod', PyAbstractMethod)
     app.add_directive('miscnews', MiscNews)
-    app.add_css_file('sidebar-wrap.css')
     app.connect('env-check-consistency', patch_pairindextypes)
     return {'version': '1.0', 'parallel_read_safe': True}
diff --git a/Doc/tools/static/sidebar-wrap.css b/Doc/tools/static/sidebar-wrap.css
deleted file mode 100644
index 0a80f516f283..000000000000
--- a/Doc/tools/static/sidebar-wrap.css
+++ /dev/null
@@ -1,6 +0,0 @@
-div.sphinxsidebarwrapper {
-    overflow-x: scroll;
-}
-div.sphinxsidebarwrapper li code {
-    overflow-wrap: normal;
-}