Include the f where needed in some f-strings. (#1225)

Co-authored-by: William Woodruff <[email protected]>

changelog/1224.bugfix.rst

@@ -0,0 +1 @@
+Fix a couple of incorrectly rendered error messages.

tests/test_sdist.py

@@ -141,7 +141,10 @@ def test_pkg_info_not_regular_file(tmp_path):
         },
     )
 
-    with pytest.raises(exceptions.InvalidDistribution, match="PKG-INFO is not a reg"):
+    with pytest.raises(
+        exceptions.InvalidDistribution,
+        match=r"^PKG-INFO is not a reg.*test-1.2.3.tar.gz$",
+    ):
         sdist.SDist(str(filepath)).read()
 
 
@@ -162,7 +165,10 @@ def test_multiple_top_level(archive_format, tmp_path):
         },
     )
 
-    with pytest.raises(exceptions.InvalidDistribution, match="Too many top-level"):
+    with pytest.raises(
+        exceptions.InvalidDistribution,
+        match=r"^Too many top-level.*test-1.2.3.(tar.gz|zip)$",
+    ):
         sdist.SDist(str(filepath)).read()
 
 

twine/sdist.py

@@ -40,14 +40,14 @@ def read(self) -> bytes:
             root = os.path.commonpath(sdist.getnames())
             if root in {".", "/", ""}:
                 raise exceptions.InvalidDistribution(
-                    "Too many top-level members in sdist archive: {self.filename}"
+                    f"Too many top-level members in sdist archive: {self.filename}"
                 )
             # ...containing the package metadata in a ``PKG-INFO`` file.
             with suppress(KeyError):
                 member = sdist.getmember(root.rstrip("/") + "/PKG-INFO")
                 if not member.isfile():
                     raise exceptions.InvalidDistribution(
-                        "PKG-INFO is not a regular file: {self.filename}"
+                        f"PKG-INFO is not a regular file: {self.filename}"
                     )
                 fd = sdist.extractfile(member)
                 assert fd is not None, "for mypy"
@@ -69,7 +69,7 @@ def read(self) -> bytes:
             root = os.path.commonpath(sdist.namelist())
             if root in {".", "/", ""}:
                 raise exceptions.InvalidDistribution(
-                    "Too many top-level members in sdist archive: {self.filename}"
+                    f"Too many top-level members in sdist archive: {self.filename}"
                 )
             # ...containing the package metadata in a ``PKG-INFO`` file.
             with suppress(KeyError):