Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/tempfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,15 @@ def _sanitize_params(prefix, suffix, dir):
output_type = _infer_return_type(prefix, suffix, dir)
if suffix is None:
suffix = output_type()
if _os.path.dirname(suffix):
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 can't contain a directory component")
if dir is None:
if output_type is str:
dir = gettempdir()
Expand Down
41 changes: 41 additions & 0 deletions Lib/test/test_tempfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2154,5 +2154,46 @@ def test_cleanup_safe(self):
# platforms, but don't forget to update the docs.
self.assertTrue(tempfile._rmtree_use_dir_fd)


class TestMisc(BaseTestCase):
def test_prefix_suffix_error(self):
tests = [
f"dir{os.sep}name",
f"{os.sep}abs_name",
]
if os.altsep is not None:
tests.extend((
f"dir{os.altsep}name",
f"{os.altsep}abs_name",
))
if support.MS_WINDOWS:
tests.append('C:name')
tests.extend(tuple(os.fsencode(path) for path in tests))

PREFIX_ERR = "prefix can't contain a directory component"
SUFFIX_ERR = "suffix can't contain a directory component"
for value in tests:
with self.subTest(value):
# test prefix
with self.assertRaisesRegex(ValueError, PREFIX_ERR):
tempfile.mkstemp(prefix=value)
with self.assertRaisesRegex(ValueError, PREFIX_ERR):
tempfile.mkdtemp(prefix=value)
with self.assertRaisesRegex(ValueError, PREFIX_ERR):
tempfile.TemporaryFile(prefix=value)
with self.assertRaisesRegex(ValueError, PREFIX_ERR):
tempfile.NamedTemporaryFile(prefix=value)

Comment thread
vstinner marked this conversation as resolved.
# test suffix
with self.assertRaisesRegex(ValueError, SUFFIX_ERR):
tempfile.mkstemp(suffix=value)
with self.assertRaisesRegex(ValueError, SUFFIX_ERR):
tempfile.mkdtemp(suffix=value)
with self.assertRaisesRegex(ValueError, SUFFIX_ERR):
tempfile.TemporaryFile(suffix=value)
with self.assertRaisesRegex(ValueError, SUFFIX_ERR):
tempfile.NamedTemporaryFile(suffix=value)

Comment thread
vstinner marked this conversation as resolved.

if __name__ == "__main__":
unittest.main()
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`tempfile` functions that take a ``prefix`` or ``suffix`` argument now raise a :exc:`ValueError` if they contain a directory component:
:func:`tempfile.mkstemp`, :func:`tempfile.mkdtemp`, :func:`tempfile.TemporaryFile`, :func:`tempfile.NamedTemporaryFile`.
Loading