From 129a73937fe2df29ffba5b6bd8e28f2f0987fe51 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 21 Jun 2012 19:40:45 +0100 Subject: [PATCH] Switched back to TemporaryFile when auto_delete = True TemporaryFile is cleaned up automatically by the OS, whereas NamedTemporaryFile isn't. --- zeroinstall/injector/download.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zeroinstall/injector/download.py b/zeroinstall/injector/download.py index 79914c0..400a851 100644 --- a/zeroinstall/injector/download.py +++ b/zeroinstall/injector/download.py @@ -78,7 +78,10 @@ class Download(object): self._final_total_size = None # Set when download is finished self.status = download_fetching - self.tempfile = tempfile.NamedTemporaryFile(prefix = 'injector-dl-data-', delete = auto_delete) + if auto_delete: + self.tempfile = tempfile.TemporaryFile(prefix = 'injector-dl-data-') + else: + self.tempfile = tempfile.NamedTemporaryFile(prefix = 'injector-dl-data-', delete = True) self._aborted = tasks.Blocker("abort " + url) @@ -129,7 +132,7 @@ class Download(object): # on us. self.aborted_by_user = True self.tempfile.close() - if not self.tempfile.delete: + if hasattr(self.tempfile, 'delete') and not self.tempfile.delete: os.remove(self.tempfile.name) self.tempfile = None self._aborted.trigger() -- 2.11.4.GIT