diff --git a/pyproject.toml b/pyproject.toml index 173e5a569e5..14235cf981e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ docs = [ "sphinxcontrib-websupport", ] lint = [ - "ruff==0.9.2", + "ruff==0.9.3", "mypy==1.14.1", "sphinx-lint>=0.9", "types-colorama==0.4.15.20240311", diff --git a/sphinx/builders/latex/__init__.py b/sphinx/builders/latex/__init__.py index 27a4767a5f6..6bd30c120d4 100644 --- a/sphinx/builders/latex/__init__.py +++ b/sphinx/builders/latex/__init__.py @@ -418,8 +418,6 @@ def assemble_doctree( nodes.Text(')'), )) break - else: - pass pendingnode.replace_self(newnodes) return largetree diff --git a/sphinx/builders/texinfo.py b/sphinx/builders/texinfo.py index f2d8c060745..4544323ad99 100644 --- a/sphinx/builders/texinfo.py +++ b/sphinx/builders/texinfo.py @@ -186,8 +186,6 @@ def assemble_doctree( nodes.Text(')'), )) break - else: - pass pendingnode.replace_self(newnodes) return largetree diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py index ebb1c1f5bb0..67eac22b0ef 100644 --- a/sphinx/ext/coverage.py +++ b/sphinx/ext/coverage.py @@ -253,7 +253,7 @@ def write_c_coverage(self) -> None: for filename, undoc in self.c_undoc.items(): write_header(op, filename) for typ, name in sorted(undoc): - op.write(' * %-50s [%9s]\n' % (name, typ)) + op.write(f' * {name:<50} [{typ:>9}]\n') if self.config.coverage_show_missing_items: if self.app.quiet: logger.warning( @@ -415,8 +415,7 @@ def _write_py_statistics(self, op: TextIO) -> None: else: table.append(['TOTAL', '100', '0']) - for line in _write_table(table): - op.write(f'{line}\n') + op.writelines(f'{line}\n' for line in _write_table(table)) def write_py_coverage(self) -> None: output_file = self.outdir / 'python.txt' @@ -445,7 +444,7 @@ def write_py_coverage(self) -> None: write_header(op, name) if undoc['funcs']: op.write('Functions:\n') - op.writelines(' * %s\n' % x for x in undoc['funcs']) + op.writelines(f' * {x}\n' for x in undoc['funcs']) if self.config.coverage_show_missing_items: if self.app.quiet: for func in undoc['funcs']: @@ -467,7 +466,7 @@ def write_py_coverage(self) -> None: op.write('Classes:\n') for class_name, methods in sorted(undoc['classes'].items()): if not methods: - op.write(' * %s\n' % class_name) + op.write(f' * {class_name}\n') if self.config.coverage_show_missing_items: if self.app.quiet: logger.warning( @@ -483,8 +482,8 @@ def write_py_coverage(self) -> None: + name ) else: - op.write(' * %s -- missing methods:\n\n' % class_name) - op.writelines(' - %s\n' % x for x in methods) + op.write(f' * {class_name} -- missing methods:\n\n') + op.writelines(f' - {x}\n' for x in methods) if self.config.coverage_show_missing_items: if self.app.quiet: for meth in methods: diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py index 4f024c22c9d..9e090dde2ef 100644 --- a/sphinx/util/typing.py +++ b/sphinx/util/typing.py @@ -83,7 +83,7 @@ pathlib.WindowsPath: 'pathlib.WindowsPath', # types in 'pickle' with .__module__ == 'pickle': pickle.Pickler: 'pickle.Pickler', - pickle.Unpickler: 'pickle.Unpickler', + pickle.Unpickler: 'pickle.Unpickler', # NoQA: S301 # types in 'struct' with .__module__ == '_struct': struct.Struct: 'struct.Struct', # types in 'types' with .__module__ == 'builtins':