Merge pull request #929 from lucc/with-block-temp-files

Use with blocks to write to temp files

3 files changed, 14 insertions, 20 deletions

diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
index 52ce5be9..c9d05b0d 100644
--- a/alot/commands/envelope.py
+++ b/alot/commands/envelope.py
@@ -375,12 +375,11 @@ class EditCommand(Command):
         old_tmpfile = None
         if self.envelope.tmpfile:
             old_tmpfile = self.envelope.tmpfile
-        self.envelope.tmpfile = tempfile.NamedTemporaryFile(delete=False,
-                                                            prefix='alot.',
-                                                            suffix='.eml')
-        self.envelope.tmpfile.write(content.encode('utf-8'))
-        self.envelope.tmpfile.flush()
-        self.envelope.tmpfile.close()
+        with tempfile.NamedTemporaryFile(
+                delete=False, prefix='alot.', suffix='.eml') as tmpfile:
+            tmpfile.write(content.encode('utf-8'))
+            tmpfile.flush()
+            self.envelope.tmpfile = tmpfile
         if old_tmpfile:
             os.unlink(old_tmpfile.name)
         cmd = globals.EditCommand(self.envelope.tmpfile.name,
diff --git a/alot/commands/thread.py b/alot/commands/thread.py
index 4b2221de..0c48c174 100644
--- a/alot/commands/thread.py
+++ b/alot/commands/thread.py
@@ -944,13 +944,10 @@ class OpenAttachmentCommand(Command):
                     filename = self.attachment.get_filename()
                     prefix, suffix = fn_hook(filename, prefix, suffix)
 
-                tmpfile = tempfile.NamedTemporaryFile(delete=False,
-                                                      prefix=prefix,
-                                                      suffix=suffix)
-
-                tempfile_name = tmpfile.name
-                self.attachment.write(tmpfile)
-                tmpfile.close()
+                with tempfile.NamedTemporaryFile(delete=False, prefix=prefix,
+                                                 suffix=suffix) as tmpfile:
+                    tempfile_name = tmpfile.name
+                    self.attachment.write(tmpfile)
 
                 def afterwards():
                     os.unlink(tempfile_name)
diff --git a/alot/db/utils.py b/alot/db/utils.py
index 188a4b3a..ab20e26b 100644
--- a/alot/db/utils.py
+++ b/alot/db/utils.py
@@ -314,13 +314,11 @@ def extract_body(mail, types=None, field_key='copiousoutput'):
                     # open tempfile, respect mailcaps nametemplate
                     nametemplate = entry.get('nametemplate', '%s')
                     prefix, suffix = parse_mailcap_nametemplate(nametemplate)
-                    tmpfile = tempfile.NamedTemporaryFile(delete=False,
-                                                          prefix=prefix,
-                                                          suffix=suffix)
-                    # write payload to tmpfile
-                    tmpfile.write(raw_payload)
-                    tmpfile.close()
-                    tempfile_name = tmpfile.name
+                    with tempfile.NamedTemporaryFile(
+                            delete=False, prefix=prefix, suffix=suffix) \
+                            as tmpfile:
+                        tmpfile.write(raw_payload)
+                        tempfile_name = tmpfile.name
                 else:
                     stdin = raw_payload