From 2fe103acda9719019c7933e1766b10285aed5db1 Mon Sep 17 00:00:00 2001 From: James Addison <55152140+jayaddison@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:05:47 +0000 Subject: [PATCH] Maintenance: apply pyupgrade suggestions for py3.9 (#11910) --- sphinx/environment/__init__.py | 4 +--- sphinx/search/__init__.py | 2 +- sphinx/util/inspect.py | 2 +- sphinx/writers/html5.py | 4 ++-- sphinx/writers/latex.py | 4 ++-- sphinx/writers/text.py | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sphinx/environment/__init__.py b/sphinx/environment/__init__.py index c96ea142c..b3f7ec9a2 100644 --- a/sphinx/environment/__init__.py +++ b/sphinx/environment/__init__.py @@ -81,9 +81,7 @@ versioning_conditions: dict[str, bool | Callable] = { 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 diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py index 3c2380c6f..74dd39382 100644 --- a/sphinx/search/__init__.py +++ b/sphinx/search/__init__.py @@ -377,7 +377,7 @@ class IndexBuilder: 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]: diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py index 8c63656fb..120437da6 100644 --- a/sphinx/util/inspect.py +++ b/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), ) diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py index 2ab7bf3ec..9eac2ebfb 100644 --- a/sphinx/writers/html5.py +++ b/sphinx/writers/html5.py @@ -247,8 +247,8 @@ class HTML5Translator(SphinxTranslator, BaseTranslator): 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: diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index 1d2ed220a..c55a211d5 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -911,8 +911,8 @@ class LaTeXTranslator(SphinxTranslator): 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: diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py index 2f4da0d4a..521c21915 100644 --- a/sphinx/writers/text.py +++ b/sphinx/writers/text.py @@ -685,8 +685,8 @@ class TextTranslator(SphinxTranslator): 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: