Simplify temporary directory cleanup

Co-Authored-By: Jon Dufresne <jon.dufresne@gmail.com>
python-pillow · hugovk · Nov 20, 2019 · Sep 26, 2019 · Sep 30, 2019 · Oct 2, 2019
commit 3a34081db5762b18e630d7b313dc75e4bebe0c31
diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
@@ -162,13 +162,10 @@ def test_pdf_open(self):

    def test_pdf_append_fails_on_nonexistent_file(self):
        im = hopper("RGB")
-        temp_dir = tempfile.mkdtemp()
-        try:
+        with tempfile.TemporaryDirectory() as temp_dir:
            self.assertRaises(
                IOError, im.save, os.path.join(temp_dir, "nonexistent.pdf"), append=True
            )
-        finally:
-            os.rmdir(temp_dir)

    def check_pdf_pages_consistency(self, pdf):
        pages_info = pdf.read_indirect(pdf.pages_ref)

diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py
@@ -314,41 +314,40 @@ def _save(im, fp, filename):
        fp.flush()

    # create the temporary set of pngs
-    iconset = tempfile.mkdtemp(".iconset")
-    provided_images = {im.width: im for im in im.encoderinfo.get("append_images", [])}
-    last_w = None
-    second_path = None
-    for w in [16, 32, 128, 256, 512]:
-        prefix = "icon_{}x{}".format(w, w)
-
-        first_path = os.path.join(iconset, prefix + ".png")
-        if last_w == w:
-            shutil.copyfile(second_path, first_path)
-        else:
-            im_w = provided_images.get(w, im.resize((w, w), Image.LANCZOS))
-            im_w.save(first_path)
-
-        second_path = os.path.join(iconset, prefix + "@2x.png")
-        im_w2 = provided_images.get(w * 2, im.resize((w * 2, w * 2), Image.LANCZOS))
-        im_w2.save(second_path)
-        last_w = w * 2
-
-    # iconutil -c icns -o {} {}
-
-    convert_cmd = ["iconutil", "-c", "icns", "-o", filename, iconset]
-    convert_proc = subprocess.Popen(
-        convert_cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
-    )
-
-    convert_proc.stdout.close()
+    with tempfile.TemporaryDirectory(".iconset") as iconset:
+        provided_images = {
+            im.width: im for im in im.encoderinfo.get("append_images", [])
+        }
+        last_w = None
+        second_path = None
+        for w in [16, 32, 128, 256, 512]:
+            prefix = "icon_{}x{}".format(w, w)
+
+            first_path = os.path.join(iconset, prefix + ".png")
+            if last_w == w:
+                shutil.copyfile(second_path, first_path)
+            else:
+                im_w = provided_images.get(w, im.resize((w, w), Image.LANCZOS))
+                im_w.save(first_path)
+
+            second_path = os.path.join(iconset, prefix + "@2x.png")
+            im_w2 = provided_images.get(w * 2, im.resize((w * 2, w * 2), Image.LANCZOS))
+            im_w2.save(second_path)
+            last_w = w * 2
+
+        # iconutil -c icns -o {} {}
+
+        convert_cmd = ["iconutil", "-c", "icns", "-o", filename, iconset]
+        convert_proc = subprocess.Popen(
+            convert_cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
+        )

-    retcode = convert_proc.wait()
+        convert_proc.stdout.close()

-    # remove the temporary files
-    shutil.rmtree(iconset)
+        retcode = convert_proc.wait()

-    if retcode:
-        raise subprocess.CalledProcessError(retcode, convert_cmd)
+        if retcode:
+            raise subprocess.CalledProcessError(retcode, convert_cmd)


 Image.register_open(IcnsImageFile.format, IcnsImageFile, lambda x: x[:4] == b"icns")