Inline ' +
common_content + ' code block
' +
common_content) in content
diff --git a/tests/test_builders/test_build_latex.py b/tests/test_builders/test_build_latex.py
index c2bd2d970..46d597ea2 100644
--- a/tests/test_builders/test_build_latex.py
+++ b/tests/test_builders/test_build_latex.py
@@ -1698,7 +1698,7 @@ def test_latex_code_role(app):
r'\PYG{k}{pass}')
assert (r'Inline \sphinxcode{\sphinxupquote{%' + '\n' +
common_content + '%\n}} code block') in content
- assert (r'\begin{sphinxVerbatim}[commandchars=\\\{\}]' +
+ assert (r'\begin{sphinxVerbatim}[commandchars=\\\{\}]'
'\n' + common_content + '\n' + r'\end{sphinxVerbatim}') in content
diff --git a/tests/test_builders/test_build_warnings.py b/tests/test_builders/test_build_warnings.py
index 0ccade75e..8a0efbf40 100644
--- a/tests/test_builders/test_build_warnings.py
+++ b/tests/test_builders/test_build_warnings.py
@@ -45,8 +45,8 @@ def _check_warnings(expected_warnings: str, warning: str) -> None:
warnings = strip_colors(re.sub(re.escape(os.sep) + '{1,2}', '/', warning))
assert re.match(f'{expected_warnings}$', warnings), (
"Warnings don't match:\n"
- + f'--- Expected (regex):\n{expected_warnings}\n'
- + f'--- Got:\n{warnings}'
+ f'--- Expected (regex):\n{expected_warnings}\n'
+ f'--- Got:\n{warnings}'
)
sys.modules.pop('autodoc_fodder', None)
diff --git a/tests/test_directives/test_directive_code.py b/tests/test_directives/test_directive_code.py
index 3f65bf586..a6c5d59bb 100644
--- a/tests/test_directives/test_directive_code.py
+++ b/tests/test_directives/test_directive_code.py
@@ -302,8 +302,8 @@ def test_code_block(app):
assert len(code_block) > 0
actual = code_block[0].text
expect = (
- " def ruby?\n" +
- " false\n" +
+ " def ruby?\n"
+ " false\n"
" end"
)
assert actual == expect
@@ -333,8 +333,8 @@ def test_code_block_caption_latex(app):
latex = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8')
caption = '\\sphinxSetupCaptionForVerbatim{caption \\sphinxstyleemphasis{test} rb}'
label = '\\def\\sphinxLiteralBlockLabel{\\label{\\detokenize{caption:id1}}}'
- link = '\\hyperref[\\detokenize{caption:name-test-rb}]' \
- '{Listing \\ref{\\detokenize{caption:name-test-rb}}}'
+ link = ('\\hyperref[\\detokenize{caption:name-test-rb}]'
+ '{Listing \\ref{\\detokenize{caption:name-test-rb}}}')
assert caption in latex
assert label in latex
assert link in latex
@@ -345,12 +345,12 @@ def test_code_block_namedlink_latex(app):
app.build(force_all=True)
latex = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8')
label1 = '\\def\\sphinxLiteralBlockLabel{\\label{\\detokenize{caption:name-test-rb}}}'
- link1 = '\\hyperref[\\detokenize{caption:name-test-rb}]'\
- '{\\sphinxcrossref{\\DUrole{std,std-ref}{Ruby}}'
+ link1 = ('\\hyperref[\\detokenize{caption:name-test-rb}]'
+ '{\\sphinxcrossref{\\DUrole{std,std-ref}{Ruby}}')
label2 = ('\\def\\sphinxLiteralBlockLabel'
'{\\label{\\detokenize{namedblocks:some-ruby-code}}}')
- link2 = '\\hyperref[\\detokenize{namedblocks:some-ruby-code}]'\
- '{\\sphinxcrossref{\\DUrole{std,std-ref}{the ruby code}}}'
+ link2 = ('\\hyperref[\\detokenize{namedblocks:some-ruby-code}]'
+ '{\\sphinxcrossref{\\DUrole{std,std-ref}{the ruby code}}}')
assert label1 in latex
assert link1 in latex
assert label2 in latex
@@ -453,8 +453,8 @@ def test_literalinclude_caption_latex(app):
latex = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8')
caption = '\\sphinxSetupCaptionForVerbatim{caption \\sphinxstylestrong{test} py}'
label = '\\def\\sphinxLiteralBlockLabel{\\label{\\detokenize{caption:id2}}}'
- link = '\\hyperref[\\detokenize{caption:name-test-py}]' \
- '{Listing \\ref{\\detokenize{caption:name-test-py}}}'
+ link = ('\\hyperref[\\detokenize{caption:name-test-py}]'
+ '{Listing \\ref{\\detokenize{caption:name-test-py}}}')
assert caption in latex
assert label in latex
assert link in latex
@@ -465,12 +465,12 @@ def test_literalinclude_namedlink_latex(app):
app.build(filenames='index')
latex = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8')
label1 = '\\def\\sphinxLiteralBlockLabel{\\label{\\detokenize{caption:name-test-py}}}'
- link1 = '\\hyperref[\\detokenize{caption:name-test-py}]'\
- '{\\sphinxcrossref{\\DUrole{std,std-ref}{Python}}'
+ link1 = ('\\hyperref[\\detokenize{caption:name-test-py}]'
+ '{\\sphinxcrossref{\\DUrole{std,std-ref}{Python}}')
label2 = ('\\def\\sphinxLiteralBlockLabel'
'{\\label{\\detokenize{namedblocks:some-python-code}}}')
- link2 = '\\hyperref[\\detokenize{namedblocks:some-python-code}]'\
- '{\\sphinxcrossref{\\DUrole{std,std-ref}{the python code}}}'
+ link2 = ('\\hyperref[\\detokenize{namedblocks:some-python-code}]'
+ '{\\sphinxcrossref{\\DUrole{std,std-ref}{the python code}}}')
assert label1 in latex
assert link1 in latex
assert label2 in latex
diff --git a/tests/test_directives/test_directive_object_description.py b/tests/test_directives/test_directive_object_description.py
index 8808c3580..b048e8b58 100644
--- a/tests/test_directives/test_directive_object_description.py
+++ b/tests/test_directives/test_directive_object_description.py
@@ -55,8 +55,8 @@ def test_object_description_sections(app):
def test_object_description_content_line_number(app):
- text = (".. py:function:: foo(bar)\n" +
- "\n" +
+ text = (".. py:function:: foo(bar)\n"
+ "\n"
" Some link here: :ref:`abc`\n")
doc = restructuredtext.parse(app, text)
xrefs = list(doc.findall(condition=addnodes.pending_xref))
diff --git a/tests/test_domains/test_domain_cpp.py b/tests/test_domains/test_domain_cpp.py
index 64c4bd2ac..114726ceb 100644
--- a/tests/test_domains/test_domain_cpp.py
+++ b/tests/test_domains/test_domain_cpp.py
@@ -485,8 +485,8 @@ def test_domain_cpp_ast_function_definitions():
check('function', 'bool namespaced::theclass::method(arg1, arg2)',
{1: "namespaced::theclass::method__arg1.arg2",
2: "N10namespaced8theclass6methodE4arg14arg2"})
- x = 'std::vector> &module::test(register int ' \
- 'foo, bar, std::string baz = "foobar, blah, bleh") const = 0'
+ x = ('std::vector> &module::test(register int '
+ 'foo, bar, std::string baz = "foobar, blah, bleh") const = 0')
check('function', x, {1: "module::test__i.bar.ssC",
2: "NK6module4testEi3barNSt6stringE"})
check('function', 'void f(std::pair)',
@@ -557,8 +557,8 @@ def test_domain_cpp_ast_function_definitions():
check('function', 'MyClass::pointer MyClass::operator->()',
{1: "MyClass::pointer-operator", 2: "N7MyClassptEv"})
- x = 'std::vector> &module::test(register int ' \
- 'foo, bar[n], std::string baz = "foobar, blah, bleh") const = 0'
+ x = ('std::vector> &module::test(register int '
+ 'foo, bar[n], std::string baz = "foobar, blah, bleh") const = 0')
check('function', x, {1: "module::test__i.barA.ssC",
2: "NK6module4testEiAn_3barNSt6stringE",
3: "NK6module4testEiA1n_3barNSt6stringE"})
@@ -920,12 +920,12 @@ def test_domain_cpp_ast_requires_clauses():
check('function', 'template requires A && B || C and D void f()',
{4: 'I0EIQooaa1A1Baa1C1DE1fvv'})
check('function',
- 'template requires R ' +
- 'template requires S ' +
+ 'template requires R '
+ 'template requires S '
'void A::f() requires B',
{4: 'I0EIQ1RI1TEEI0EIQaa1SI1TE1BEN1A1fEvv'})
check('function',
- 'template requires R typename X> ' +
+ 'template requires R typename X> '
'void f()',
{2: 'II0EIQ1RI1TEE0E1fv', 4: 'II0EIQ1RI1TEE0E1fvv'})
check('type',
diff --git a/tests/test_domains/test_domain_js.py b/tests/test_domains/test_domain_js.py
index a7d093060..2078c6a56 100644
--- a/tests/test_domains/test_domain_js.py
+++ b/tests/test_domains/test_domain_js.py
@@ -234,8 +234,8 @@ def test_no_index_entry(app):
def test_module_content_line_number(app):
- text = (".. js:module:: foo\n" +
- "\n" +
+ text = (".. js:module:: foo\n"
+ "\n"
" Some link here: :ref:`abc`\n")
doc = restructuredtext.parse(app, text)
xrefs = list(doc.findall(condition=addnodes.pending_xref))
diff --git a/tests/test_domains/test_domain_py.py b/tests/test_domains/test_domain_py.py
index 4362469f8..69cae6852 100644
--- a/tests/test_domains/test_domain_py.py
+++ b/tests/test_domains/test_domain_py.py
@@ -691,8 +691,8 @@ def test_domain_py_python_maximum_signature_line_length_in_text(app):
def test_module_content_line_number(app):
- text = (".. py:module:: foo\n" +
- "\n" +
+ text = (".. py:module:: foo\n"
+ "\n"
" Some link here: :ref:`abc`\n")
doc = restructuredtext.parse(app, text)
xrefs = list(doc.findall(condition=addnodes.pending_xref))
diff --git a/tests/test_extensions/test_ext_apidoc.py b/tests/test_extensions/test_ext_apidoc.py
index 0d1b519ce..b0ea2e34c 100644
--- a/tests/test_extensions/test_ext_apidoc.py
+++ b/tests/test_extensions/test_ext_apidoc.py
@@ -322,9 +322,10 @@ def test_toc_all_references_should_exist_pep420_enabled(make_app, apidoc):
if not (outdir / filename).is_file():
missing_files.append(filename)
- assert len(missing_files) == 0, \
- 'File(s) referenced in TOC not found: {}\n' \
- 'TOC:\n{}'.format(", ".join(missing_files), toc)
+ all_missing = ', '.join(missing_files)
+ assert len(missing_files) == 0, (
+ f'File(s) referenced in TOC not found: {all_missing}\nTOC:\n{toc}'
+ )
@pytest.mark.apidoc(
@@ -352,9 +353,10 @@ def test_toc_all_references_should_exist_pep420_disabled(make_app, apidoc):
if not (outdir / filename).is_file():
missing_files.append(filename)
- assert len(missing_files) == 0, \
- 'File(s) referenced in TOC not found: {}\n' \
- 'TOC:\n{}'.format(", ".join(missing_files), toc)
+ all_missing = ', '.join(missing_files)
+ assert len(missing_files) == 0, (
+ f'File(s) referenced in TOC not found: {all_missing}\nTOC:\n{toc}'
+ )
def extract_toc(path):
diff --git a/tests/test_extensions/test_ext_autosummary.py b/tests/test_extensions/test_ext_autosummary.py
index 2f8bb9467..14fc4cf65 100644
--- a/tests/test_extensions/test_ext_autosummary.py
+++ b/tests/test_extensions/test_ext_autosummary.py
@@ -186,8 +186,9 @@ def test_get_items_summary(make_app, app_params):
'C.C2': 'This is a nested inner class docstring',
}
for key, expected in expected_values.items():
- assert autosummary_items[key][2] == expected, 'Summary for %s was %r -'\
- ' expected %r' % (key, autosummary_items[key], expected)
+ assert autosummary_items[key][2] == expected, (
+ f'Summary for {key} was {autosummary_items[key]!r} - expected {expected!r}'
+ )
# check an item in detail
assert 'func' in autosummary_items
diff --git a/tests/test_extensions/test_ext_ifconfig.py b/tests/test_extensions/test_ext_ifconfig.py
index e1e2f0a73..24986789b 100644
--- a/tests/test_extensions/test_ext_ifconfig.py
+++ b/tests/test_extensions/test_ext_ifconfig.py
@@ -17,8 +17,8 @@ def test_ifconfig(app):
def test_ifconfig_content_line_number(app):
app.setup_extension("sphinx.ext.ifconfig")
- text = (".. ifconfig:: confval1\n" +
- "\n" +
+ text = (".. ifconfig:: confval1\n"
+ "\n"
" Some link here: :ref:`abc`\n")
doc = restructuredtext.parse(app, text)
xrefs = list(doc.findall(condition=addnodes.pending_xref))
diff --git a/tests/test_extensions/test_ext_viewcode.py b/tests/test_extensions/test_ext_viewcode.py
index 2bb2116c7..ce5abeb51 100644
--- a/tests/test_extensions/test_ext_viewcode.py
+++ b/tests/test_extensions/test_ext_viewcode.py
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
def check_viewcode_output(app: SphinxTestApp) -> str:
warnings = re.sub(r'\\+', '/', app.warning.getvalue())
assert re.findall(
- r"index.rst:\d+: WARNING: Object named 'func1' not found in include " +
+ r"index.rst:\d+: WARNING: Object named 'func1' not found in include "
r"file .*/spam/__init__.py'",
warnings,
)
@@ -131,7 +131,7 @@ def test_local_source_files(app):
warnings = re.sub(r'\\+', '/', app.warning.getvalue())
assert re.findall(
- r"index.rst:\d+: WARNING: Object named 'func1' not found in include " +
+ r"index.rst:\d+: WARNING: Object named 'func1' not found in include "
r"file .*/not_a_package/__init__.py'",
warnings,
)
diff --git a/tests/test_intl/test_intl.py b/tests/test_intl/test_intl.py
index 8c787e669..6fc5f448f 100644
--- a/tests/test_intl/test_intl.py
+++ b/tests/test_intl/test_intl.py
@@ -1307,8 +1307,7 @@ def test_xml_label_targets(app):
assert_elem(
para3[0],
['X', 'bridge label',
- 'IS NOT TRANSLATABLE BUT LINKED TO TRANSLATED ' +
- 'SECTION TITLE.'],
+ 'IS NOT TRANSLATABLE BUT LINKED TO TRANSLATED SECTION TITLE.'],
['label-bridged-target-section'])
assert_elem(
para3[1],