[Fix UP031] Manually, keeping some required %r specifiers

Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>

Author: Pierre-Sassoulas

bench/empty.py

@@ -2,4 +2,4 @@
 
 
 for i in range(1000):
-    exec("def test_func_%d(): pass" % i)
+    exec(f"def test_func_{i}(): pass")

pyproject.toml

@@ -158,7 +158,6 @@ lint.ignore = [
     "PLW2901", # for loop variable overwritten by assignment target
     # ruff ignore
     "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
-    "UP031",
 ]
 lint.per-file-ignores."src/_pytest/_py/**/*.py" = [
     "B",

src/_pytest/_code/code.py

@@ -217,7 +217,7 @@ def relline(self) -> int:
         return self.lineno - self.frame.code.firstlineno
 
     def __repr__(self) -> str:
-        return "<TracebackEntry %s:%d>" % (self.frame.code.path, self.lineno + 1)
+        return f"<TracebackEntry {self.frame.code.path}:{self.lineno+1}>"
 
     @property
     def statement(self) -> Source:
@@ -303,12 +303,7 @@ def __str__(self) -> str:
         # This output does not quite match Python's repr for traceback entries,
         # but changing it to do so would break certain plugins.  See
         # https://github.com/pytest-dev/pytest/pull/7535/ for details.
-        return "  File %r:%d in %s\n  %s\n" % (
-            str(self.path),
-            self.lineno + 1,
-            name,
-            line,
-        )
+        return f"  File '{self.path}':{self.lineno+1} in {name}\n  {line}\n"
 
     @property
     def name(self) -> str:

src/_pytest/_io/pprint.py

@@ -540,7 +540,7 @@ def _pprint_deque(
     ) -> None:
         stream.write(object.__class__.__name__ + "(")
         if object.maxlen is not None:
-            stream.write("maxlen=%d, " % object.maxlen)
+            stream.write(f"maxlen={object.maxlen}, ")
         stream.write("[")
 
         self._format_items(object, stream, indent, allowance + 1, context, level)

src/_pytest/_py/error.py

@@ -69,7 +69,7 @@ def _geterrnoclass(self, eno: int) -> type[Error]:
         try:
             return self._errno2class[eno]
         except KeyError:
-            clsname = errno.errorcode.get(eno, "UnknownErrno%d" % (eno,))
+            clsname = errno.errorcode.get(eno, f"UnknownErrno{eno}")
             errorcls = type(
                 clsname,
                 (Error,),

src/_pytest/assertion/util.py

@@ -406,8 +406,7 @@ def _compare_eq_sequence(
             ]
         else:
             explanation += [
-                "%s contains %d more items, first extra item: %s"
-                % (dir_with_more, len_diff, highlighter(extra))
+                f"{dir_with_more} contains {len_diff} more items, first extra item: {highlighter(extra)}"
             ]
     return explanation
 
@@ -510,8 +509,7 @@ def _compare_eq_dict(
     len_extra_left = len(extra_left)
     if len_extra_left:
         explanation.append(
-            "Left contains %d more item%s:"
-            % (len_extra_left, "" if len_extra_left == 1 else "s")
+            f"Left contains {len_extra_left} more item{'' if len_extra_left == 1 else 's'}:"
         )
         explanation.extend(
             highlighter(pprint.pformat({k: left[k] for k in extra_left})).splitlines()
@@ -520,8 +518,7 @@ def _compare_eq_dict(
     len_extra_right = len(extra_right)
     if len_extra_right:
         explanation.append(
-            "Right contains %d more item%s:"
-            % (len_extra_right, "" if len_extra_right == 1 else "s")
+            f"Right contains {len_extra_right} more item{'' if len_extra_right == 1 else 's'}:"
         )
         explanation.extend(
             highlighter(pprint.pformat({k: right[k] for k in extra_right})).splitlines()

src/_pytest/cacheprovider.py

@@ -388,8 +388,8 @@ def pytest_collection_modifyitems(
             if not previously_failed:
                 # Running a subset of all tests with recorded failures
                 # only outside of it.
-                self._report_status = "%d known failures not in selected tests" % (
-                    len(self.lastfailed),
+                self._report_status = (
+                    f"{len(self.lastfailed)} known failures not in selected tests"
                 )
             else:
                 if self.config.getoption("lf"):
@@ -622,5 +622,5 @@ def cacheshow(config: Config, session: Session) -> int:
             #    print("%s/" % p.relative_to(basedir))
             if p.is_file():
                 key = str(p.relative_to(basedir))
-                tw.line(f"{key} is a file of length {p.stat().st_size:d}")
+                tw.line(f"{key} is a file of length {p.stat().st_size}")
     return 0

src/_pytest/compat.py

@@ -71,8 +71,8 @@ def getlocation(function, curdir: str | os.PathLike[str] | None = None) -> str:
         except ValueError:
             pass
         else:
-            return "%s:%d" % (relfn, lineno + 1)
-    return "%s:%d" % (fn, lineno + 1)
+            return f"{relfn}:{lineno+1}"
+    return f"{fn}:{lineno+1}"
 
 
 def num_mock_patch_args(function) -> int:

src/_pytest/doctest.py

@@ -353,7 +353,7 @@ def repr_failure(  # type: ignore[override]
                 # add line numbers to the left of the error message
                 assert test.lineno is not None
                 lines = [
-                    "%03d %s" % (i + test.lineno + 1, x) for (i, x) in enumerate(lines)
+                    f"{i + test.lineno + 1:03d} {x}" for (i, x) in enumerate(lines)
                 ]
                 # trim docstring error lines to 10
                 lines = lines[max(example.lineno - 9, 0) : example.lineno + 1]

src/_pytest/fixtures.py

@@ -884,7 +884,7 @@ def toterminal(self, tw: TerminalWriter) -> None:
                     red=True,
                 )
         tw.line()
-        tw.line("%s:%d" % (os.fspath(self.filename), self.firstlineno + 1))
+        tw.line(f"{os.fspath(self.filename)}:{self.firstlineno + 1}")
 
 
 def call_fixture_func(

src/_pytest/main.py

@@ -349,8 +349,7 @@ def pytest_collection(session: Session) -> None:
 def pytest_runtestloop(session: Session) -> bool:
     if session.testsfailed and not session.config.option.continue_on_collection_errors:
         raise session.Interrupted(
-            "%d error%s during collection"
-            % (session.testsfailed, "s" if session.testsfailed != 1 else "")
+            f"{session.testsfailed} error{'s' if session.testsfailed != 1 else ''} during collection"
         )
 
     if session.config.option.collectonly:
@@ -585,13 +584,12 @@ def from_config(cls, config: Config) -> Session:
         return session
 
     def __repr__(self) -> str:
-        return "<%s %s exitstatus=%r testsfailed=%d testscollected=%d>" % (
-            self.__class__.__name__,
-            self.name,
-            getattr(self, "exitstatus", "<UNSET>"),
-            self.testsfailed,
-            self.testscollected,
-        )
+        return (
+            f"<{self.__class__.__name__} {self.name} "
+            f"exitstatus=%r "
+            f"testsfailed={self.testsfailed} "
+            f"testscollected={self.testscollected}>"
+        ) % getattr(self, "exitstatus", "<UNSET>")
 
     @property
     def shouldstop(self) -> bool | str:
@@ -654,7 +652,7 @@ def pytest_runtest_logreport(self, report: TestReport | CollectReport) -> None:
             self.testsfailed += 1
             maxfail = self.config.getvalue("maxfail")
             if maxfail and self.testsfailed >= maxfail:
-                self.shouldfail = "stopping after %d failures" % (self.testsfailed)
+                self.shouldfail = f"stopping after {self.testsfailed} failures"
 
     pytest_collectreport = pytest_runtest_logreport
 

src/_pytest/mark/structures.py

@@ -48,13 +48,7 @@ def get_empty_parameterset_mark(
     from ..nodes import Collector
 
     fs, lineno = getfslineno(func)
-    reason = "got empty parameter set %r, function %s at %s:%d" % (
-        argnames,
-        func.__name__,
-        fs,
-        lineno,
-    )
-
+    reason = f"got empty parameter set {argnames!r}, function {func.__name__} at {fs}:{lineno}"
     requested_mark = config.getini(EMPTY_PARAMETERSET_OPTION)
     if requested_mark in ("", None, "skip"):
         mark = MARK_GEN.skip(reason=reason)
@@ -64,7 +58,7 @@ def get_empty_parameterset_mark(
         f_name = func.__name__
         _, lineno = getfslineno(func)
         raise Collector.CollectError(
-            "Empty parameter set in '%s' at line %d" % (f_name, lineno + 1)
+            f"Empty parameter set in '{f_name}' at line {lineno + 1}"
         )
     else:
         raise LookupError(requested_mark)

src/_pytest/pytester.py

@@ -547,8 +547,10 @@ def __init__(
 
     def __repr__(self) -> str:
         return (
-            "<RunResult ret=%s len(stdout.lines)=%d len(stderr.lines)=%d duration=%.2fs>"
-            % (self.ret, len(self.stdout.lines), len(self.stderr.lines), self.duration)
+            f"<RunResult ret={self.ret!s} "
+            f"len(stdout.lines)={len(self.stdout.lines)} "
+            f"len(stderr.lines)={len(self.stderr.lines)} "
+            f"duration={self.duration:.2f}s>"
         )
 
     def parseoutcomes(self) -> dict[str, int]:

src/_pytest/terminal.py

@@ -766,13 +766,13 @@ def report_collect(self, final: bool = False) -> None:
             str(self._numcollected) + " item" + ("" if self._numcollected == 1 else "s")
         )
         if errors:
-            line += " / %d error%s" % (errors, "s" if errors != 1 else "")
+            line += f" / {errors} error{'s' if errors != 1 else ''}"
         if deselected:
-            line += " / %d deselected" % deselected
+            line += f" / {deselected} deselected"
         if skipped:
-            line += " / %d skipped" % skipped
+            line += f" / {skipped} skipped"
         if self._numcollected > selected:
-            line += " / %d selected" % selected
+            line += f" / {selected} selected"
         if self.isatty:
             self.rewrite(line, bold=True, erase=True)
             if final:
@@ -862,7 +862,7 @@ def _printcollecteditems(self, items: Sequence[Item]) -> None:
             if test_cases_verbosity < -1:
                 counts = Counter(item.nodeid.split("::", 1)[0] for item in items)
                 for name, count in sorted(counts.items()):
-                    self._tw.line("%s: %d" % (name, count))
+                    self._tw.line(f"{name}: {count}")
             else:
                 for item in items:
                     self._tw.line(item.nodeid)
@@ -1254,11 +1254,9 @@ def show_skipped_folded(lines: list[str]) -> None:
                 if reason.startswith(prefix):
                     reason = reason[len(prefix) :]
                 if lineno is not None:
-                    lines.append(
-                        "%s [%d] %s:%d: %s" % (markup_word, num, fspath, lineno, reason)
-                    )
+                    lines.append(f"{markup_word} [{num}] {fspath}:{lineno}: {reason}")
                 else:
-                    lines.append("%s [%d] %s: %s" % (markup_word, num, fspath, reason))
+                    lines.append(f"{markup_word} [{num}] {fspath}: {reason}")
 
         def show_skipped_unfolded(lines: list[str]) -> None:
             skipped: list[CollectReport] = self.stats.get("skipped", [])
@@ -1375,7 +1373,7 @@ def _build_normal_summary_stats_line(
                 count = len(reports)
                 color = _color_for_type.get(key, _color_for_type_default)
                 markup = {color: True, "bold": color == main_color}
-                parts.append(("%d %s" % pluralize(count, key), markup))
+                parts.append(("%d %s" % pluralize(count, key), markup))  # noqa: UP031
 
         if not parts:
             parts = [("no tests ran", {_color_for_type_default: True})]
@@ -1394,7 +1392,7 @@ def _build_collect_only_summary_stats_line(
 
         elif deselected == 0:
             main_color = "green"
-            collected_output = "%d %s collected" % pluralize(self._numcollected, "test")
+            collected_output = "%d %s collected" % pluralize(self._numcollected, "test")  # noqa: UP031
             parts = [(collected_output, {main_color: True})]
         else:
             all_tests_were_deselected = self._numcollected == deselected
@@ -1410,7 +1408,7 @@ def _build_collect_only_summary_stats_line(
 
         if errors:
             main_color = _color_for_type["error"]
-            parts += [("%d %s" % pluralize(errors, "error"), {main_color: True})]
+            parts += [("%d %s" % pluralize(errors, "error"), {main_color: True})]  # noqa: UP031
 
         return parts, main_color
 

testing/_py/test_local.py

@@ -948,7 +948,7 @@ def test_make_numbered_dir(self, tmpdir):
                 prefix="base.", rootdir=tmpdir, keep=2, lock_timeout=0
             )
             assert numdir.check()
-            assert numdir.basename == "base.%d" % i
+            assert numdir.basename == f"base.{i}"
             if i >= 1:
                 assert numdir.new(ext=str(i - 1)).check()
             if i >= 2:
@@ -993,7 +993,7 @@ def test_locked_make_numbered_dir(self, tmpdir):
         for i in range(10):
             numdir = local.make_numbered_dir(prefix="base2.", rootdir=tmpdir, keep=2)
             assert numdir.check()
-            assert numdir.basename == "base2.%d" % i
+            assert numdir.basename == f"base2.{i}"
             for j in range(i):
                 assert numdir.new(ext=str(j)).check()
 

testing/example_scripts/dataclasses/test_compare_dataclasses_with_custom_eq.py

@@ -10,8 +10,8 @@ class SimpleDataObject:
         field_a: int = field()
         field_b: str = field()
 
-        def __eq__(self, __o: object, /) -> bool:
-            return super().__eq__(__o)
+        def __eq__(self, o: object, /) -> bool:
+            return super().__eq__(o)
 
     left = SimpleDataObject(1, "b")
     right = SimpleDataObject(1, "c")

testing/python/metafunc.py

@@ -1438,13 +1438,13 @@ def test_parametrize_scope_overrides(
         self, pytester: Pytester, scope: str, length: int
     ) -> None:
         pytester.makepyfile(
-            """
+            f"""
             import pytest
             values = []
             def pytest_generate_tests(metafunc):
                 if "arg" in metafunc.fixturenames:
                     metafunc.parametrize("arg", [1,2], indirect=True,
-                                         scope=%r)
+                                         scope={scope!r})
             @pytest.fixture
             def arg(request):
                 values.append(request.param)
@@ -1454,9 +1454,8 @@ def test_hello(arg):
             def test_world(arg):
                 assert arg in (1,2)
             def test_checklength():
-                assert len(values) == %d
+                assert len(values) == {length}
         """
-            % (scope, length)
         )
         reprec = pytester.inline_run()
         reprec.assertoutcome(passed=5)

testing/test_assertion.py

@@ -1406,15 +1406,14 @@ def test_full_output_truncated(self, monkeypatch, pytester: Pytester) -> None:
         line_len = 100
         expected_truncated_lines = 2
         pytester.makepyfile(
-            r"""
+            rf"""
             def test_many_lines():
-                a = list([str(i)[0] * %d for i in range(%d)])
+                a = list([str(i)[0] * {line_len} for i in range({line_count})])
                 b = a[::2]
                 a = '\n'.join(map(str, a))
                 b = '\n'.join(map(str, b))
                 assert a == b
         """
-            % (line_len, line_count)
         )
         monkeypatch.delenv("CI", raising=False)
 
@@ -1424,7 +1423,7 @@ def test_many_lines():
             [
                 "*+ 1*",
                 "*+ 3*",
-                "*truncated (%d lines hidden)*use*-vv*" % expected_truncated_lines,
+                f"*truncated ({expected_truncated_lines} lines hidden)*use*-vv*",
             ]
         )
 

testing/test_conftest.py

@@ -699,9 +699,9 @@ def out_of_reach(): pass
     result = pytester.runpytest(*args)
     match = ""
     if passed:
-        match += "*%d passed*" % passed
+        match += f"*{passed} passed*"
     if error:
-        match += "*%d error*" % error
+        match += f"*{error} error*"
     result.stdout.fnmatch_lines(match)
 
 

testing/test_doctest.py

@@ -1328,7 +1328,7 @@ def test_bar():
         params = ("--doctest-modules",) if enable_doctest else ()
         passes = 3 if enable_doctest else 2
         result = pytester.runpytest(*params)
-        result.stdout.fnmatch_lines(["*=== %d passed in *" % passes])
+        result.stdout.fnmatch_lines([f"*=== {passes} passed in *"])
 
     @pytest.mark.parametrize("scope", SCOPES)
     @pytest.mark.parametrize("autouse", [True, False])

testing/test_terminal.py

@@ -49,7 +49,7 @@ def __init__(self, verbosity=0):
     @property
     def args(self):
         values = []
-        values.append("--verbosity=%d" % self.verbosity)
+        values.append(f"--verbosity={self.verbosity}")
         return values