Drop the :d in f-string formatting

Pierre-Sassoulas · Pierre-Sassoulas · commit 9fc42b19e5ec · 2024-11-29T22:06:29.000+01:00
diff --git a/bench/empty.py b/bench/empty.py
@@ -2,4 +2,4 @@
 
 
 for i in range(1000):
-    exec(f"def test_func_{i:d}(): pass")
+    exec(f"def test_func_{i}(): pass")
diff --git a/src/_pytest/_code/code.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 f"<TracebackEntry {self.frame.code.path}:{self.lineno+1:d}>"
+        return f"<TracebackEntry {self.frame.code.path}:{self.lineno+1}>"
 
     @property
     def statement(self) -> Source:
diff --git a/src/_pytest/_io/pprint.py b/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(f"maxlen={object.maxlen:d}, ")
+            stream.write(f"maxlen={object.maxlen}, ")
         stream.write("[")
 
         self._format_items(object, stream, indent, allowance + 1, context, level)
diff --git a/src/_pytest/_py/error.py b/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, f"UnknownErrno{eno:d}")
+            clsname = errno.errorcode.get(eno, f"UnknownErrno{eno}")
             errorcls = type(
                 clsname,
                 (Error,),
diff --git a/src/_pytest/assertion/util.py b/src/_pytest/assertion/util.py
@@ -406,7 +406,7 @@ def _compare_eq_sequence(
             ]
         else:
             explanation += [
-                f"{dir_with_more} contains {len_diff:d} more items, first extra item: {highlighter(extra)}"
+                f"{dir_with_more} contains {len_diff} more items, first extra item: {highlighter(extra)}"
             ]
     return explanation
 
@@ -509,7 +509,7 @@ def _compare_eq_dict(
     len_extra_left = len(extra_left)
     if len_extra_left:
         explanation.append(
-            f"Left contains {len_extra_left:d} more item{'' 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()
@@ -518,7 +518,7 @@ def _compare_eq_dict(
     len_extra_right = len(extra_right)
     if len_extra_right:
         explanation.append(
-            f"Right contains {len_extra_right:d} more item{'' 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()
diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py
@@ -389,7 +389,7 @@ def pytest_collection_modifyitems(
                 # Running a subset of all tests with recorded failures
                 # only outside of it.
                 self._report_status = (
-                    f"{len(self.lastfailed):d} known failures not in selected tests"
+                    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
diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py
@@ -71,8 +71,8 @@ def getlocation(function, curdir: str | os.PathLike[str] | None = None) -> str:
         except ValueError:
             pass
         else:
-            return f"{relfn}:{lineno+1:d}"
-    return f"{fn}:{lineno+1:d}"
+            return f"{relfn}:{lineno+1}"
+    return f"{fn}:{lineno+1}"
 
 
 def num_mock_patch_args(function) -> int:
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
@@ -884,7 +884,7 @@ def toterminal(self, tw: TerminalWriter) -> None:
                     red=True,
                 )
         tw.line()
-        tw.line(f"{os.fspath(self.filename)}:{self.firstlineno + 1:d}")
+        tw.line(f"{os.fspath(self.filename)}:{self.firstlineno + 1}")
 
 
 def call_fixture_func(
diff --git a/src/_pytest/main.py b/src/_pytest/main.py
@@ -349,7 +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(
-            f"{session.testsfailed:d} error{'s' if session.testsfailed != 1 else ''} during collection"
+            f"{session.testsfailed} error{'s' if session.testsfailed != 1 else ''} during collection"
         )
 
     if session.config.option.collectonly:
@@ -587,8 +587,8 @@ def __repr__(self) -> str:
         return (
             f"<{self.__class__.__name__} {self.name} "
             f"exitstatus=%r "
-            f"testsfailed={self.testsfailed:d} "
-            f"testscollected={self.testscollected:d}>"
+            f"testsfailed={self.testsfailed} "
+            f"testscollected={self.testscollected}>"
         ) % getattr(self, "exitstatus", "<UNSET>")
 
     @property
@@ -652,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 = f"stopping after {self.testsfailed:d} failures"
+                self.shouldfail = f"stopping after {self.testsfailed} failures"
 
     pytest_collectreport = pytest_runtest_logreport
 
diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py
@@ -48,7 +48,9 @@ def get_empty_parameterset_mark(
     from ..nodes import Collector
 
     fs, lineno = getfslineno(func)
-    reason = f"got empty parameter set {argnames}, function {func.__name__} at {fs}:{lineno:d}"
+    reason = (
+        f"got empty parameter set {argnames}, 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)
@@ -58,7 +60,7 @@ def get_empty_parameterset_mark(
         f_name = func.__name__
         _, lineno = getfslineno(func)
         raise Collector.CollectError(
-            f"Empty parameter set in '{f_name}' at line {lineno + 1:d}"
+            f"Empty parameter set in '{f_name}' at line {lineno + 1}"
         )
     else:
         raise LookupError(requested_mark)
diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
@@ -548,8 +548,8 @@ def __init__(
     def __repr__(self) -> str:
         return (
             f"<RunResult ret={self.ret} "
-            f"len(stdout.lines)={len(self.stdout.lines):d} "
-            f"len(stderr.lines)={len(self.stderr.lines):d} "
+            f"len(stdout.lines)={len(self.stdout.lines)} "
+            f"len(stderr.lines)={len(self.stderr.lines)} "
             f"duration={self.duration:.2f}s>"
         )
 
diff --git a/src/_pytest/terminal.py b/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 += f" / {errors:d} error{'s' if errors != 1 else ''}"
+            line += f" / {errors} error{'s' if errors != 1 else ''}"
         if deselected:
-            line += f" / {deselected:d} deselected"
+            line += f" / {deselected} deselected"
         if skipped:
-            line += f" / {skipped:d} skipped"
+            line += f" / {skipped} skipped"
         if self._numcollected > selected:
-            line += f" / {selected:d} 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(f"{name}: {count:d}")
+                    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(
-                        f"{markup_word} [{num:d}] {fspath}:{lineno:d}: {reason}"
-                    )
+                    lines.append(f"{markup_word} [{num}] {fspath}:{lineno}: {reason}")
                 else:
-                    lines.append(f"{markup_word} [{num:d}] {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", [])
diff --git a/testing/_py/test_local.py b/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 == f"base.{i:d}"
+            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 == f"base2.{i:d}"
+            assert numdir.basename == f"base2.{i}"
             for j in range(i):
                 assert numdir.new(ext=str(j)).check()
 
diff --git a/testing/test_assertion.py b/testing/test_assertion.py
@@ -1408,7 +1408,7 @@ def test_full_output_truncated(self, monkeypatch, pytester: Pytester) -> None:
         pytester.makepyfile(
             rf"""
             def test_many_lines():
-                a = list([str(i)[0] * {line_len:d} for i in range({line_count: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))
@@ -1423,7 +1423,7 @@ def test_many_lines():
             [
                 "*+ 1*",
                 "*+ 3*",
-                f"*truncated ({expected_truncated_lines:d} lines hidden)*use*-vv*",
+                f"*truncated ({expected_truncated_lines} lines hidden)*use*-vv*",
             ]
         )
 
diff --git a/testing/test_conftest.py b/testing/test_conftest.py
@@ -699,9 +699,9 @@ def out_of_reach(): pass
     result = pytester.runpytest(*args)
     match = ""
     if passed:
-        match += f"*{passed:d} passed*"
+        match += f"*{passed} passed*"
     if error:
-        match += f"*{error:d} error*"
+        match += f"*{error} error*"
     result.stdout.fnmatch_lines(match)
 
 
diff --git a/testing/test_doctest.py b/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([f"*=== {passes:d} passed in *"])
+        result.stdout.fnmatch_lines([f"*=== {passes} passed in *"])
 
     @pytest.mark.parametrize("scope", SCOPES)
     @pytest.mark.parametrize("autouse", [True, False])
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
@@ -49,7 +49,7 @@ def __init__(self, verbosity=0):
     @property
     def args(self):
         values = []
-        values.append(f"--verbosity={self.verbosity:d}")
+        values.append(f"--verbosity={self.verbosity}")
         return values
 
 

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`for i in range(1000):`
`5`		`- exec(f"def test_func_{i:d}(): pass")`
	`5`	`+ exec(f"def test_func_{i}(): pass")`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ def _compare_eq_sequence(`
`406`	`406`	`]`
`407`	`407`	`else:`
`408`	`408`	`explanation += [`
`409`		`- f"{dir_with_more} contains {len_diff:d} more items, first extra item: {highlighter(extra)}"`
	`409`	`+ f"{dir_with_more} contains {len_diff} more items, first extra item: {highlighter(extra)}"`
`410`	`410`	`]`
`411`	`411`	`return explanation`
`412`	`412`
`@@ -509,7 +509,7 @@ def _compare_eq_dict(`
`509`	`509`	`len_extra_left = len(extra_left)`
`510`	`510`	`if len_extra_left:`
`511`	`511`	`explanation.append(`
`512`		`- f"Left contains {len_extra_left:d} more item{'' if len_extra_left == 1 else 's'}:"`
	`512`	`+ f"Left contains {len_extra_left} more item{'' if len_extra_left == 1 else 's'}:"`
`513`	`513`	`)`
`514`	`514`	`explanation.extend(`
`515`	`515`	`highlighter(pprint.pformat({k: left[k] for k in extra_left})).splitlines()`
`@@ -518,7 +518,7 @@ def _compare_eq_dict(`
`518`	`518`	`len_extra_right = len(extra_right)`
`519`	`519`	`if len_extra_right:`
`520`	`520`	`explanation.append(`
`521`		`- f"Right contains {len_extra_right:d} more item{'' if len_extra_right == 1 else 's'}:"`
	`521`	`+ f"Right contains {len_extra_right} more item{'' if len_extra_right == 1 else 's'}:"`
`522`	`522`	`)`
`523`	`523`	`explanation.extend(`
`524`	`524`	`highlighter(pprint.pformat({k: right[k] for k in extra_right})).splitlines()`
Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ def toterminal(self, tw: TerminalWriter) -> None:`
`884`	`884`	`red=True,`
`885`	`885`	`)`
`886`	`886`	`tw.line()`
`887`		`- tw.line(f"{os.fspath(self.filename)}:{self.firstlineno + 1:d}")`
	`887`	`+ tw.line(f"{os.fspath(self.filename)}:{self.firstlineno + 1}")`
`888`	`888`
`889`	`889`
`890`	`890`	`def call_fixture_func(`