python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 10:46:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed the Ghostscript() function inside of EpsImagePlugin to use subprocess.Popen() instead of the deprecated os.popen().

Browse Source
This commit is contained in:
Esteban Santana Santana 2013-11-20 01:32:06 -06:00
parent 16a0a640f2
commit 9cd654917d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PIL/EpsImagePlugin.py
View File

@ -65,7 +65,7 @@ def Ghostscript(tile, size, fp, scale=1):
bbox = [bbox[0], bbox[1], bbox[2] * scale, bbox[3] * scale] bbox = [bbox[0], bbox[1], bbox[2] * scale, bbox[3] * scale]
#print("Ghostscript", scale, size, orig_size, bbox, orig_bbox) #print("Ghostscript", scale, size, orig_size, bbox, orig_bbox)
import tempfile, os import tempfile, os, subprocess
file = tempfile.mktemp() file = tempfile.mktemp()
@ -77,30 +77,28 @@ def Ghostscript(tile, size, fp, scale=1):
"-dNOPAUSE -dSAFER", # don't pause between pages, safe mode "-dNOPAUSE -dSAFER", # don't pause between pages, safe mode
"-sDEVICE=ppmraw", # ppm driver "-sDEVICE=ppmraw", # ppm driver
"-sOutputFile=%s" % file,# output file "-sOutputFile=%s" % file,# output file
"- >/dev/null 2>/dev/null"] ]
if gs_windows_binary is not None: if gs_windows_binary is not None:
if gs_windows_binary is False: if gs_windows_binary is False:
raise WindowsError('Unable to locate Ghostscript on paths') raise WindowsError('Unable to locate Ghostscript on paths')
command[0] = gs_windows_binary command[0] = gs_windows_binary
command[-1] = '- >nul 2>nul'
command = " ".join(command)
# push data through ghostscript # push data through ghostscript
try: try:
gs = os.popen(command, "w") gs = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
# adjust for image origin # adjust for image origin
if bbox[0] != 0 or bbox[1] != 0: if bbox[0] != 0 or bbox[1] != 0:
gs.write("%d %d translate\n" % (-bbox[0], -bbox[1])) gs.stdin.write("%d %d translate\n" % (-bbox[0], -bbox[1]))
fp.seek(offset) fp.seek(offset)
while length > 0: while length > 0:
s = fp.read(8192) s = fp.read(8192)
if not s: if not s:
break break
length = length - len(s) length = length - len(s)
gs.write(s) gs.stdin.write(s)
status = gs.close() gs.stdin.close()
status = gs.wait()
if status: if status:
raise IOError("gs failed (status %d)" % status) raise IOError("gs failed (status %d)" % status)
im = Image.core.open_ppm(file) im = Image.core.open_ppm(file)