Enforce more ruff rules (#5922)

* Apply ruff/flake8-implicit-str-concat rule ISC003

ISC003 Explicitly concatenated string should be implicitly concatenated

* Enforce ruff/flake8-implicit-str-concat rules (ISC)

* Apply ruff/Perflint rule PERF102

PERF102 When using only the values of a dict use the `values()` method

* Apply ruff/Perflint rule PERF401

PERF401 Use a list comprehension to create a transformed list

* Enforce ruff/Perflint rules (PERF)

pyproject.toml

@@ -152,6 +152,8 @@ extend-select = [
   "C4",          # flake8-comprehensions
   "EM",          # flake8-errmsg
   "ICN",         # flake8-import-conventions
+  "ISC",         # flake8-implicit-str-concat
+  "PERF",        # Perflint
   "PGH",         # pygrep-hooks
   "PIE",         # flake8-pie
   "PL",          # pylint

tests/test_class_sh_basic.py

@@ -112,8 +112,8 @@ def test_pass_unique_ptr_disowns(pass_f, rtrn_f, expected):
         pass_f(obj)
     assert str(exc_info.value) == (
         "Missing value for wrapped C++ type"
-        + " `pybind11_tests::class_sh_basic::atyp`:"
+        " `pybind11_tests::class_sh_basic::atyp`:"
-        + " Python instance was disowned."
+        " Python instance was disowned."
     )
 
 

tests/test_iostream.py

@@ -288,11 +288,7 @@ def test_redirect_both(capfd):
 def test_threading():
     with m.ostream_redirect(stdout=True, stderr=False):
         # start some threads
-        threads = []
+        threads = [m.TestThread() for _j in range(20)]
-
-        # start some threads
-        for _j in range(20):
-            threads.append(m.TestThread())
 
         # give the threads some time to fail
         threads[0].sleep()

tests/test_stl_binders.py

@@ -258,7 +258,7 @@ def test_noncopyable_containers():
             assert nvnc[i][j].value == j + 1
 
     # Note: maps do not have .values()
-    for _, v in nvnc.items():
+    for v in nvnc.values():
         for i, j in enumerate(v, start=1):
             assert j.value == i
 
@@ -269,7 +269,7 @@ def test_noncopyable_containers():
             assert nmnc[i][j].value == 10 * j
 
     vsum = 0
-    for _, v_o in nmnc.items():
+    for v_o in nmnc.values():
         for k_i, v_i in v_o.items():
             assert v_i.value == 10 * k_i
             vsum += v_i.value
@@ -283,7 +283,7 @@ def test_noncopyable_containers():
             assert numnc[i][j].value == 10 * j
 
     vsum = 0
-    for _, v_o in numnc.items():
+    for v_o in numnc.values():
         for k_i, v_i in v_o.items():
             assert v_i.value == 10 * k_i
             vsum += v_i.value