IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Addison
2024-02-14 10:05:47 +00:00
committed by GitHub
parent 08386826fb
commit 2fe103acda
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/environment/__init__.py
View File

@@ -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

2
sphinx/search/__init__.py
View File

@@ -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]:

2
sphinx/util/inspect.py
View File

@@ -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),
)

4
sphinx/writers/html5.py
View File

@@ -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:

4
sphinx/writers/latex.py
View File

@@ -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:

4
sphinx/writers/text.py
View File

@@ -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: