Skip to content

bpo-29573: Fixed unlinking already removed NamedTemporaryFile. #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andrewnester wants to merge 1 commit into from
Closed

bpo-29573: Fixed unlinking already removed NamedTemporaryFile. #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Lib/tempfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ def close(self, unlink=_os.unlink):
try:
self.file.close()
finally:
if self.delete:
if self.delete and _os.path.isfile(self.name):
unlink(self.name)

# Need to ensure the file is deleted on __del__
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_tempfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,13 @@ def test_bad_mode(self):
tempfile.NamedTemporaryFile(mode=2, dir=dir)
self.assertEqual(os.listdir(dir), [])

def test_if_temp_file_already_removed(self):
tmpdir = tempfile.mkdtemp()
Copy link
Member

@briancurtin briancurtin Feb 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should add a self.addCleanup on that tmpdir—see the test above (test_bad_mode) for an example, just to make sure that if this test ever does fail that we don't have a temp dir that doesn't get cleaned up by us.

Copy link
Contributor Author

@andrewnester andrewnester Feb 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@briancurtin right, thanks! fixed

Copy link
Contributor Author

@andrewnester andrewnester May 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@briancurtin could you please review it again, it's fixed now

self.addCleanup(support.rmtree, tmpdir)
with tempfile.NamedTemporaryFile(delete=True, dir=tmpdir) as fp:
os.system('rm {}'.format(fp.name))
Copy link
Member

@Yhg1s Yhg1s May 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this use os.system to call rm, rather than calling os.unlink? 'rm' is not exactly cross-platform. This test will also fail on Windows (and other systems where you can't delete files that are currently in use). It'll have to be skipped on those platforms.

self.assertEqual(os.listdir(tmpdir), [])

# How to test the mode and bufsize parameters?

class TestSpooledTemporaryFile(BaseTestCase):
Expand Down