From 2457fc2a816aa7c9ca0be82a4595567204d5457e Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sat, 24 Oct 1998 15:02:59 +0000 Subject: [PATCH] Improvement to the previous fix suggested by Thomas Bellman: if the unlink() or fdopen() fail, close the file descriptor and re-raise the exception. --- Lib/tempfile.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/tempfile.py b/Lib/tempfile.py index 140eebccf91..1f301262db8 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -129,8 +129,12 @@ def TemporaryFile(mode='w+b', bufsize=-1, suffix=""): if os.name == 'posix': # Unix -- be very careful fd = os.open(name, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700) - os.unlink(name) - return os.fdopen(fd, mode, bufsize) + try: + os.unlink(name) + return os.fdopen(fd, mode, bufsize) + except: + os.close(fd) + raise else: # Non-unix -- can't unlink file that's still open, use wrapper file = open(name, mode, bufsize)