summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Smith <smithdc@gmail.com>2023-08-01 21:22:53 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-08-03 09:38:10 +0200
commit75418f8c0e5e8fcfb557bf8e69fc1ccfd64b697d (patch)
tree2369fa01687555e038e7c44ec33d7171ace571c1
parent848fe70f3ee6dc151831251076dc0a4a9db5a0ec (diff)
[3.2.x] Fixed #34756 -- Fixed docs HTML build on Sphinx 7.1+.
Backport of b3e0170ab546a96930ce3114b0a1a560953c0ff4 from main
-rw-r--r--docs/_ext/djangodocs.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index 5208a53255..6eadc23144 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -130,10 +130,23 @@ class DjangoHTMLTranslator(HTMLTranslator):
def visit_desc_parameterlist(self, node):
self.body.append('(') # by default sphinx puts <big> around the "("
- self.first_param = 1
self.optional_param_level = 0
self.param_separator = node.child_text_separator
- self.required_params_left = sum(isinstance(c, addnodes.desc_parameter) for c in node.children)
+ # Counts 'parameter groups' being either a required parameter, or a set
+ # of contiguous optional ones.
+ required_params = [
+ isinstance(c, addnodes.desc_parameter) for c in node.children
+ ]
+ # How many required parameters are left.
+ self.required_params_left = sum(required_params)
+ if sphinx_version < (7, 1):
+ self.first_param = 1
+ else:
+ self.is_first_param = True
+ self.params_left_at_level = 0
+ self.param_group_index = 0
+ self.list_is_required_param = required_params
+ self.multi_line_parameter_list = False
def depart_desc_parameterlist(self, node):
self.body.append(')')