[Python-checkins] GH-103805: Lib test f541 linting issue fix (#103812)
gpshead
webhook-mailer at python.org
Mon Apr 24 19:24:56 EDT 2023
https://github.com/python/cpython/commit/8291ae31ddc2f935b8ec60f3d5f3825f78ccf244
commit: 8291ae31ddc2f935b8ec60f3d5f3825f78ccf244
branch: main
author: Rodolfo M. Pereira <rodolfomp123 at gmail.com>
committer: gpshead <greg at krypto.org>
date: 2023-04-24T23:24:49Z
summary:
GH-103805: Lib test f541 linting issue fix (#103812)
This PR makes some minor linting adjustments to the Lib/test module
caught by [ruff](https://github.com/charliermarsh/ruff). The adjustments
are all related to the `F541 f-string without any placeholders` issue.
Issue: https://github.com/python/cpython/issues/103805
<!-- gh-issue-number: gh-103805 -->
* Issue: gh-103805
<!-- /gh-issue-number -->
---------
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Gregory P. Smith <greg at krypto.org>
files:
M Lib/test/test__xxinterpchannels.py
M Lib/test/test__xxsubinterpreters.py
M Lib/test/test_capi/test_misc.py
M Lib/test/test_code.py
M Lib/test/test_collections.py
M Lib/test/test_coroutines.py
M Lib/test/test_dataclasses.py
M Lib/test/test_embed.py
M Lib/test/test_import/__init__.py
M Lib/test/test_launcher.py
M Lib/test/test_peepholer.py
M Lib/test/test_sqlite3/test_regression.py
M Lib/test/test_sqlite3/test_userfunctions.py
M Lib/test/test_traceback.py
diff --git a/Lib/test/test__xxinterpchannels.py b/Lib/test/test__xxinterpchannels.py
index b65281106f66..750cd99b85e7 100644
--- a/Lib/test/test__xxinterpchannels.py
+++ b/Lib/test/test__xxinterpchannels.py
@@ -1469,19 +1469,19 @@ def _assert_closed_in_interp(self, fix, interp=None):
with self.assertRaises(channels.ChannelClosedError):
channels.close(fix.cid, force=True)
else:
- run_interp(interp.id, f"""
+ run_interp(interp.id, """
with helpers.expect_channel_closed():
channels.recv(cid)
""")
- run_interp(interp.id, f"""
+ run_interp(interp.id, """
with helpers.expect_channel_closed():
channels.send(cid, b'spam')
""")
- run_interp(interp.id, f"""
+ run_interp(interp.id, """
with helpers.expect_channel_closed():
channels.close(cid)
""")
- run_interp(interp.id, f"""
+ run_interp(interp.id, """
with helpers.expect_channel_closed():
channels.close(cid, force=True)
""")
diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py
index 965967e3f273..1ee18774d172 100644
--- a/Lib/test/test__xxsubinterpreters.py
+++ b/Lib/test/test__xxsubinterpreters.py
@@ -798,7 +798,7 @@ def test_shared_overwrites(self):
"""))
shared = {'spam': b'ham'}
- script = dedent(f"""
+ script = dedent("""
ns2 = dict(vars())
del ns2['__builtins__']
""")
@@ -902,7 +902,7 @@ def test_execution_namespace_is_main(self):
# XXX Fix this test!
@unittest.skip('blocking forever')
def test_still_running_at_exit(self):
- script = dedent(f"""
+ script = dedent("""
from textwrap import dedent
import threading
import _xxsubinterpreters as _interpreters
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index eab693001961..9470cf12a7d1 100644
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -1421,7 +1421,7 @@ def callback():
@threading_helper.requires_working_threading()
def test_gilstate_ensure_no_deadlock(self):
# See https://github.com/python/cpython/issues/96071
- code = textwrap.dedent(f"""
+ code = textwrap.dedent("""
import _testcapi
def callback():
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index ecb3525a9284..ca06a39f5df1 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -356,7 +356,7 @@ def foo():
foo.__code__ = foo.__code__.replace(
co_code=b'\xe5' + foo.__code__.co_code[1:])
- msg = f"unknown opcode 229"
+ msg = "unknown opcode 229"
with self.assertRaisesRegex(SystemError, msg):
foo()
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index bfe18c7fc503..fb568a483964 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -1626,7 +1626,7 @@ def test_Set_from_iterable(self):
class SetUsingInstanceFromIterable(MutableSet):
def __init__(self, values, created_by):
if not created_by:
- raise ValueError(f'created_by must be specified')
+ raise ValueError('created_by must be specified')
self.created_by = created_by
self._values = set(values)
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 6ab19efcc588..47145782c0f0 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -2365,15 +2365,15 @@ def check(depth, msg):
f"coroutine '{corofn.__qualname__}' was never awaited\n",
"Coroutine created at (most recent call last)\n",
f' File "{a1_filename}", line {a1_lineno}, in a1\n',
- f' return corofn() # comment in a1',
+ " return corofn() # comment in a1",
]))
check(2, "".join([
f"coroutine '{corofn.__qualname__}' was never awaited\n",
"Coroutine created at (most recent call last)\n",
f' File "{a2_filename}", line {a2_lineno}, in a2\n',
- f' return a1() # comment in a2\n',
+ " return a1() # comment in a2\n",
f' File "{a1_filename}", line {a1_lineno}, in a1\n',
- f' return corofn() # comment in a1',
+ " return corofn() # comment in a1",
]))
finally:
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
index ae8bfcc149e8..7dd81a8855f1 100644
--- a/Lib/test/test_dataclasses.py
+++ b/Lib/test/test_dataclasses.py
@@ -757,8 +757,8 @@ class Point:
class Subclass(typ): pass
with self.assertRaisesRegex(ValueError,
- f"mutable default .*Subclass'>"
- ' for field z is not allowed'
+ "mutable default .*Subclass'>"
+ " for field z is not allowed"
):
@dataclass
class Point:
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index f702ffb99905..c9691bbf3049 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -110,7 +110,7 @@ def run_embedded_interpreter(self, *args, env=None,
print(f"--- {cmd} failed ---")
print(f"stdout:\n{out}")
print(f"stderr:\n{err}")
- print(f"------")
+ print("------")
self.assertEqual(p.returncode, returncode,
"bad returncode %d, stderr is %r" %
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index f206e52faf8c..41dfdaabe246 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -1887,7 +1887,7 @@ def from_module(cls, mod):
self.init_count = mod.initialized_count()
return self
- SCRIPT_BODY = ModuleSnapshot.SCRIPT_BODY + textwrap.dedent(f'''
+ SCRIPT_BODY = ModuleSnapshot.SCRIPT_BODY + textwrap.dedent('''
snapshot['module'].update(dict(
int_const=mod.int_const,
str_const=mod.str_const,
diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index 2f35eaf08a2d..362b507d1582 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -394,17 +394,17 @@ def test_filter_to_company_with_default(self):
def test_filter_to_tag(self):
company = "PythonTestSuite"
- data = self.run_py([f"-V:3.100"])
+ data = self.run_py(["-V:3.100"])
self.assertEqual("X.Y.exe", data["LaunchCommand"])
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100", data["env.tag"])
- data = self.run_py([f"-V:3.100-32"])
+ data = self.run_py(["-V:3.100-32"])
self.assertEqual("X.Y-32.exe", data["LaunchCommand"])
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100-32", data["env.tag"])
- data = self.run_py([f"-V:3.100-arm64"])
+ data = self.run_py(["-V:3.100-arm64"])
self.assertEqual("X.Y-arm64.exe -X fake_arg_for_test", data["LaunchCommand"])
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100-arm64", data["env.tag"])
@@ -421,7 +421,7 @@ def test_filter_to_company_and_tag(self):
def test_filter_with_single_install(self):
company = "PythonTestSuite1"
data = self.run_py(
- [f"-V:Nonexistent"],
+ ["-V:Nonexistent"],
env={"PYLAUNCHER_LIMIT_TO_COMPANY": company},
expect_returncode=103,
)
@@ -500,7 +500,7 @@ def test_py_default_short_argv0(self):
data = self.run_py(["--version"], argv=f'{argv0} --version')
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100", data["SearchInfo.tag"])
- self.assertEqual(f'X.Y.exe --version', data["stdout"].strip())
+ self.assertEqual("X.Y.exe --version", data["stdout"].strip())
def test_py_default_in_list(self):
data = self.run_py(["-0"], env=TEST_PY_ENV)
@@ -662,7 +662,7 @@ def test_install(self):
self.assertIn("9PJPW5LDXLZ5", cmd)
def test_literal_shebang_absolute(self):
- with self.script(f"#! C:/some_random_app -witharg") as script:
+ with self.script("#! C:/some_random_app -witharg") as script:
data = self.run_py([script])
self.assertEqual(
f"C:\\some_random_app -witharg {script}",
@@ -670,7 +670,7 @@ def test_literal_shebang_absolute(self):
)
def test_literal_shebang_relative(self):
- with self.script(f"#! ..\\some_random_app -witharg") as script:
+ with self.script("#! ..\\some_random_app -witharg") as script:
data = self.run_py([script])
self.assertEqual(
f"{script.parent.parent}\\some_random_app -witharg {script}",
@@ -678,14 +678,14 @@ def test_literal_shebang_relative(self):
)
def test_literal_shebang_quoted(self):
- with self.script(f'#! "some random app" -witharg') as script:
+ with self.script('#! "some random app" -witharg') as script:
data = self.run_py([script])
self.assertEqual(
f'"{script.parent}\\some random app" -witharg {script}',
data["stdout"].strip(),
)
- with self.script(f'#! some" random "app -witharg') as script:
+ with self.script('#! some" random "app -witharg') as script:
data = self.run_py([script])
self.assertEqual(
f'"{script.parent}\\some random app" -witharg {script}',
@@ -693,7 +693,7 @@ def test_literal_shebang_quoted(self):
)
def test_literal_shebang_quoted_escape(self):
- with self.script(f'#! some\\" random "app -witharg') as script:
+ with self.script('#! some\\" random "app -witharg') as script:
data = self.run_py([script])
self.assertEqual(
f'"{script.parent}\\some\\ random app" -witharg {script}',
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index 01eb04b53060..bf7fc421a9df 100644
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -810,7 +810,7 @@ def f():
self.assertInBytecode(f, 'LOAD_FAST', "a73")
def test_setting_lineno_no_undefined(self):
- code = textwrap.dedent(f"""\
+ code = textwrap.dedent("""\
def f():
x = y = 2
if not x:
@@ -842,7 +842,7 @@ def trace(frame, event, arg):
self.assertEqual(f.__code__.co_code, co_code)
def test_setting_lineno_one_undefined(self):
- code = textwrap.dedent(f"""\
+ code = textwrap.dedent("""\
def f():
x = y = 2
if not x:
@@ -876,7 +876,7 @@ def trace(frame, event, arg):
self.assertEqual(f.__code__.co_code, co_code)
def test_setting_lineno_two_undefined(self):
- code = textwrap.dedent(f"""\
+ code = textwrap.dedent("""\
def f():
x = y = 2
if not x:
diff --git a/Lib/test/test_sqlite3/test_regression.py b/Lib/test/test_sqlite3/test_regression.py
index ad83a97c8c40..7e8221e7227e 100644
--- a/Lib/test/test_sqlite3/test_regression.py
+++ b/Lib/test/test_sqlite3/test_regression.py
@@ -491,21 +491,21 @@ def tearDown(self):
def test_recursive_cursor_init(self):
conv = lambda x: self.cur.__init__(self.con)
with patch.dict(sqlite.converters, {"INIT": conv}):
- self.cur.execute(f'select x as "x [INIT]", x from test')
+ self.cur.execute('select x as "x [INIT]", x from test')
self.assertRaisesRegex(sqlite.ProgrammingError, self.msg,
self.cur.fetchall)
def test_recursive_cursor_close(self):
conv = lambda x: self.cur.close()
with patch.dict(sqlite.converters, {"CLOSE": conv}):
- self.cur.execute(f'select x as "x [CLOSE]", x from test')
+ self.cur.execute('select x as "x [CLOSE]", x from test')
self.assertRaisesRegex(sqlite.ProgrammingError, self.msg,
self.cur.fetchall)
def test_recursive_cursor_iter(self):
conv = lambda x, l=[]: self.cur.fetchone() if l else l.append(None)
with patch.dict(sqlite.converters, {"ITER": conv}):
- self.cur.execute(f'select x as "x [ITER]", x from test')
+ self.cur.execute('select x as "x [ITER]", x from test')
self.assertRaisesRegex(sqlite.ProgrammingError, self.msg,
self.cur.fetchall)
diff --git a/Lib/test/test_sqlite3/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py
index 0970b0378ad6..632d657d416f 100644
--- a/Lib/test/test_sqlite3/test_userfunctions.py
+++ b/Lib/test/test_sqlite3/test_userfunctions.py
@@ -562,7 +562,7 @@ def test_win_exception_in_finalize(self):
# callback errors to sqlite3_step(); this implies that OperationalError
# is _not_ raised.
with patch.object(WindowSumInt, "finalize", side_effect=BadWindow):
- name = f"exception_in_finalize"
+ name = "exception_in_finalize"
self.con.create_window_function(name, 1, WindowSumInt)
self.cur.execute(self.query % name)
self.cur.fetchall()
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index a6172ff05eed..5e2b35378299 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -802,12 +802,12 @@ def f():
)()
actual = self.get_exception(f)
expected = [
- f"Traceback (most recent call last):",
+ "Traceback (most recent call last):",
f" File \"{__file__}\", line {self.callable_line}, in get_exception",
- f" callable()",
+ " callable()",
f" File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
- f" .method",
- f" ^^^^^^",
+ " .method",
+ " ^^^^^^",
]
self.assertEqual(actual, expected)
@@ -818,11 +818,11 @@ def f():
)()
actual = self.get_exception(f)
expected = [
- f"Traceback (most recent call last):",
+ "Traceback (most recent call last):",
f" File \"{__file__}\", line {self.callable_line}, in get_exception",
- f" callable()",
+ " callable()",
f" File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
- f" method",
+ " method",
]
self.assertEqual(actual, expected)
@@ -833,12 +833,12 @@ def f():
)()
actual = self.get_exception(f)
expected = [
- f"Traceback (most recent call last):",
+ "Traceback (most recent call last):",
f" File \"{__file__}\", line {self.callable_line}, in get_exception",
- f" callable()",
+ " callable()",
f" File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
- f" . method",
- f" ^^^^^^",
+ " . method",
+ " ^^^^^^",
]
self.assertEqual(actual, expected)
@@ -848,11 +848,11 @@ def f():
actual = self.get_exception(f)
expected = [
- f"Traceback (most recent call last):",
+ "Traceback (most recent call last):",
f" File \"{__file__}\", line {self.callable_line}, in get_exception",
- f" callable()",
+ " callable()",
f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
- f" ｗｉｄｔｈ",
+ " ｗｉｄｔｈ",
]
self.assertEqual(actual, expected)
@@ -864,11 +864,11 @@ def f():
actual = self.get_exception(f)
expected = [
- f"Traceback (most recent call last):",
+ "Traceback (most recent call last):",
f" File \"{__file__}\", line {self.callable_line}, in get_exception",
- f" callable()",
+ " callable()",
f" File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
- f" raise ValueError(ｗｉｄｔｈ)",
+ " raise ValueError(ｗｉｄｔｈ)",
]
self.assertEqual(actual, expected)
@@ -882,12 +882,12 @@ def f():
actual = self.get_exception(f)
expected = [
- f"Traceback (most recent call last):",
+ "Traceback (most recent call last):",
f" File \"{__file__}\", line {self.callable_line}, in get_exception",
- f" callable()",
+ " callable()",
f" File \"{__file__}\", line {f.__code__.co_firstlineno + 4}, in f",
- f" print(1, ｗｗｗ(",
- f" ^^^^",
+ " print(1, ｗｗｗ(",
+ " ^^^^",
]
self.assertEqual(actual, expected)
@@ -2844,26 +2844,26 @@ def test_max_group_width(self):
formatted = ''.join(teg.format()).split('\n')
expected = [
- f' | ExceptionGroup: eg (2 sub-exceptions)',
- f' +-+---------------- 1 ----------------',
- f' | ExceptionGroup: eg1 (3 sub-exceptions)',
- f' +-+---------------- 1 ----------------',
- f' | ValueError: 0',
- f' +---------------- 2 ----------------',
- f' | ValueError: 1',
- f' +---------------- ... ----------------',
- f' | and 1 more exception',
- f' +------------------------------------',
- f' +---------------- 2 ----------------',
- f' | ExceptionGroup: eg2 (10 sub-exceptions)',
- f' +-+---------------- 1 ----------------',
- f' | TypeError: 0',
- f' +---------------- 2 ----------------',
- f' | TypeError: 1',
- f' +---------------- ... ----------------',
- f' | and 8 more exceptions',
- f' +------------------------------------',
- f'']
+ ' | ExceptionGroup: eg (2 sub-exceptions)',
+ ' +-+---------------- 1 ----------------',
+ ' | ExceptionGroup: eg1 (3 sub-exceptions)',
+ ' +-+---------------- 1 ----------------',
+ ' | ValueError: 0',
+ ' +---------------- 2 ----------------',
+ ' | ValueError: 1',
+ ' +---------------- ... ----------------',
+ ' | and 1 more exception',
+ ' +------------------------------------',
+ ' +---------------- 2 ----------------',
+ ' | ExceptionGroup: eg2 (10 sub-exceptions)',
+ ' +-+---------------- 1 ----------------',
+ ' | TypeError: 0',
+ ' +---------------- 2 ----------------',
+ ' | TypeError: 1',
+ ' +---------------- ... ----------------',
+ ' | and 8 more exceptions',
+ ' +------------------------------------',
+ '']
self.assertEqual(formatted, expected)
@@ -2876,22 +2876,22 @@ def test_max_group_depth(self):
formatted = ''.join(teg.format()).split('\n')
expected = [
- f' | ExceptionGroup: exc (3 sub-exceptions)',
- f' +-+---------------- 1 ----------------',
- f' | ValueError: -2',
- f' +---------------- 2 ----------------',
- f' | ExceptionGroup: exc (3 sub-exceptions)',
- f' +-+---------------- 1 ----------------',
- f' | ValueError: -1',
- f' +---------------- 2 ----------------',
- f' | ... (max_group_depth is 2)',
- f' +---------------- 3 ----------------',
- f' | ValueError: 1',
- f' +------------------------------------',
- f' +---------------- 3 ----------------',
- f' | ValueError: 2',
- f' +------------------------------------',
- f'']
+ ' | ExceptionGroup: exc (3 sub-exceptions)',
+ ' +-+---------------- 1 ----------------',
+ ' | ValueError: -2',
+ ' +---------------- 2 ----------------',
+ ' | ExceptionGroup: exc (3 sub-exceptions)',
+ ' +-+---------------- 1 ----------------',
+ ' | ValueError: -1',
+ ' +---------------- 2 ----------------',
+ ' | ... (max_group_depth is 2)',
+ ' +---------------- 3 ----------------',
+ ' | ValueError: 1',
+ ' +------------------------------------',
+ ' +---------------- 3 ----------------',
+ ' | ValueError: 2',
+ ' +------------------------------------',
+ '']
self.assertEqual(formatted, expected)
More information about the Python-checkins
mailing list