File size: 2,604 Bytes
8247f19 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | diff --git a/PIL/EpsImagePlugin.py b/PIL/EpsImagePlugin.py
index a8706b05f..fcfae8a81 100644
--- a/PIL/EpsImagePlugin.py
+++ b/PIL/EpsImagePlugin.py
@@ -67,7 +67,8 @@ def Ghostscript(tile, size, fp, scale=1):
import tempfile, os, subprocess
- file = tempfile.mktemp()
+ out_fd, file = tempfile.mkstemp()
+ os.close(out_fd)
# Build ghostscript command
command = ["gs",
diff --git a/PIL/Image.py b/PIL/Image.py
index 87631d6f7..915f5b1df 100644
--- a/PIL/Image.py
+++ b/PIL/Image.py
@@ -495,14 +495,17 @@ class Image:
self.readonly = 0
def _dump(self, file=None, format=None):
- import tempfile
+ import tempfile, os
if not file:
- file = tempfile.mktemp()
+ f, file = tempfile.mkstemp(format or '')
+ os.close(f)
+
self.load()
if not format or format == "PPM":
self.im.save_ppm(file)
else:
- file = file + "." + format
+ if file.endswith(format):
+ file = file + "." + format
self.save(file, format)
return file
diff --git a/PIL/IptcImagePlugin.py b/PIL/IptcImagePlugin.py
index 157b73509..104153002 100644
--- a/PIL/IptcImagePlugin.py
+++ b/PIL/IptcImagePlugin.py
@@ -172,8 +172,8 @@ class IptcImageFile(ImageFile.ImageFile):
self.fp.seek(offset)
# Copy image data to temporary file
- outfile = tempfile.mktemp()
- o = open(outfile, "wb")
+ o_fd, outfile = tempfile.mkstemp(text=False)
+ o = os.fdopen(o_fd)
if encoding == "raw":
# To simplify access to the extracted file,
# prepend a PPM header
diff --git a/PIL/JpegImagePlugin.py b/PIL/JpegImagePlugin.py
index 90d3b5194..67dc5ba7d 100644
--- a/PIL/JpegImagePlugin.py
+++ b/PIL/JpegImagePlugin.py
@@ -344,13 +344,17 @@ class JpegImageFile(ImageFile.ImageFile):
# ALTERNATIVE: handle JPEGs via the IJG command line utilities
import tempfile, os
- file = tempfile.mktemp()
- os.system("djpeg %s >%s" % (self.filename, file))
+ f, path = tempfile.mkstemp()
+ os.close(f)
+ if os.path.exists(self.filename):
+ os.system("djpeg '%s' >'%s'" % (self.filename, path))
+ else:
+ raise ValueError("Invalid Filename")
try:
- self.im = Image.core.open_ppm(file)
+ self.im = Image.core.open_ppm(path)
finally:
- try: os.unlink(file)
+ try: os.unlink(path)
except: pass
self.mode = self.im.mode
|