Maintenance: apply pyupgrade suggestions for py3.9 (#11910)

sphinx/environment/__init__.py

@@ -81,9 +81,7 @@
 
 if TYPE_CHECKING:
  from collections.abc import MutableMapping
- from typing import Literal
-
- from typing_extensions import overload
+ from typing import Literal, overload
 
  from sphinx.domains.c import CDomain
  from sphinx.domains.changeset import ChangeSetDomain

sphinx/search/__init__.py

@@ -377,7 +377,7 @@ def get_terms(self, fn2index: dict[str, int]) -> tuple[dict[str, list[int] | int
  if fn in fn2index:
  rv[k] = fn2index[fn]
  else:
- rv[k] = sorted([fn2index[fn] for fn in v if fn in fn2index])
+ rv[k] = sorted(fn2index[fn] for fn in v if fn in fn2index)
  return rvs
 
  def freeze(self) -> dict[str, Any]:

sphinx/util/inspect.py

@@ -400,7 +400,7 @@ def object_description(obj: Any, *, _seen: frozenset = frozenset()) -> str:
  if id(obj) in seen:
  return 'tuple(...)'
  seen |= frozenset([id(obj)])
- return '(%s%s)' % (
+ return '({}{})'.format(
  ', '.join(object_description(x, _seen=seen) for x in obj),
  ',' * (len(obj) == 1),
  )

sphinx/writers/html5.py

@@ -247,8 +247,8 @@ def depart_desc_type_parameter(self, node: Element) -> None:
  self.depart_desc_parameter(node)
 
  def visit_desc_optional(self, node: Element) -> None:
- self.params_left_at_level = sum([isinstance(c, addnodes.desc_parameter)
-  for c in node.children])
+ self.params_left_at_level = sum(isinstance(c, addnodes.desc_parameter)
+ for c in node.children)
  self.optional_param_level += 1
  self.max_optional_param_level = self.optional_param_level
  if self.multi_line_parameter_list:

sphinx/writers/latex.py

@@ -911,8 +911,8 @@ def depart_desc_type_parameter(self, node: Element) -> None:
  self._depart_sig_parameter(node)
 
  def visit_desc_optional(self, node: Element) -> None:
- self.params_left_at_level = sum([isinstance(c, addnodes.desc_parameter)
-  for c in node.children])
+ self.params_left_at_level = sum(isinstance(c, addnodes.desc_parameter)
+ for c in node.children)
  self.optional_param_level += 1
  self.max_optional_param_level = self.optional_param_level
  if self.multi_line_parameter_list:

sphinx/writers/text.py

@@ -685,8 +685,8 @@ def visit_desc_type_parameter(self, node: Element) -> None:
  self.visit_desc_parameter(node)
 
  def visit_desc_optional(self, node: Element) -> None:
- self.params_left_at_level = sum([isinstance(c, addnodes.desc_parameter)
-  for c in node.children])
+ self.params_left_at_level = sum(isinstance(c, addnodes.desc_parameter)
+ for c in node.children)
  self.optional_param_level += 1
  self.max_optional_param_level = self.optional_param_level
  if self.multi_line_parameter_list: