Use code-review suggestions.

Co-authored-by: Victor Stinner <vstinner@python.org>

Author: mbyrnepr2

Lib/tempfile.py

@@ -120,14 +120,14 @@ def _sanitize_params(prefix, suffix, dir):
     if suffix is None:
         suffix = output_type()
     if _os.path.dirname(suffix):
-        raise ValueError("'prefix' or 'suffix' can't contain a directory component")
+        raise ValueError("'suffix' can't contain a directory component")
     if prefix is None:
         if output_type is str:
             prefix = template
         else:
             prefix = _os.fsencode(template)
     if _os.path.dirname(prefix):
-        raise ValueError("'prefix' or 'suffix' can't contain a directory component")
+        raise ValueError("'prefix' can't contain a directory component")
     if dir is None:
         if output_type is str:
             dir = gettempdir()

Lib/test/test_tempfile.py

@@ -2156,28 +2156,47 @@ def test_cleanup_safe(self):
 
 
 class TestPrefixAndSuffix(BaseTestCase):
-    def test_value_error_if_prefix_or_suffix_contains_directory(self):
-        MESSAGE = "'prefix' or 'suffix' can't contain a directory component"
-
-        if os.altsep is None:
-            data = (
-                ((os.sep), None),
-                (os.fsencode(os.sep), tempfile.gettempdirb()),
-                )
-        else:
-            data = (
-                ((os.altsep), None),
-                (os.fsencode(os.altsep), tempfile.gettempdirb()),
-                )
+    DATA = (
+        f"dir{os.sep}name",
+        f"{os.sep}abs_name",
+        os.fsencode(f"dir{os.sep}name"),
+        os.fsencode(f"{os.sep}abs_name"),
+    )
+    if os.altsep is not None:
+        DATA += (
+            f"dir{os.altsep}name",
+            f"{os.altsep}abs_name",
+            os.fsencode(f"dir{os.altsep}name"),
+            os.fsencode(f"{os.altsep}abs_name"),
+        )
+
+    def test_prefix_error(self):
+        MESSAGE = "'prefix' can't contain a directory component"
+
+        for value in self.DATA:
+            with self.subTest((value)):
+                with self.assertRaisesRegex(ValueError, MESSAGE):
+                    tempfile.mkstemp(prefix=value)
+                with self.assertRaisesRegex(ValueError, MESSAGE):
+                    os.rmdir(tempfile.mkdtemp(prefix=value))
+                with self.assertRaisesRegex(ValueError, MESSAGE):
+                    tempfile.TemporaryFile(prefix=value)
+                with self.assertRaisesRegex(ValueError, MESSAGE):
+                    tempfile.NamedTemporaryFile(prefix=value)
 
-        for value, directory in data:
-            with self.subTest((value, directory)):
+    def test_suffix_error(self):
+        MESSAGE = "'suffix' can't contain a directory component"
+
+        for value in self.DATA:
+            with self.subTest((value)):
+                with self.assertRaisesRegex(ValueError, MESSAGE):
+                    tempfile.mkstemp(suffix=value)
                 with self.assertRaisesRegex(ValueError, MESSAGE):
-                    tempfile.mkstemp(dir=directory, prefix=value)
+                    os.rmdir(tempfile.mkdtemp(suffix=value))
                 with self.assertRaisesRegex(ValueError, MESSAGE):
-                    os.rmdir(tempfile.mkdtemp(dir=directory, prefix=value))
+                    tempfile.TemporaryFile(suffix=value)
                 with self.assertRaisesRegex(ValueError, MESSAGE):
-                    tempfile.NamedTemporaryFile(dir=directory, prefix=value, delete=True)
+                    tempfile.NamedTemporaryFile(suffix=value)
 
 
 if __name__ == "__main__":