python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-03 11:23:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2214 from jdufresne/eps-text-wrapper

Browse Source 
Use TextIOWrapper.detach() instead of NoCloseStream
This commit is contained in:
Hugo 2018-09-26 15:34:24 +03:00 committed by GitHub
commit 9e54c14dfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/PIL/EpsImagePlugin.py
View File

@ -356,54 +356,49 @@ def _save(im, fp, filename, eps=1):
else: else:
raise ValueError("image mode is not supported") raise ValueError("image mode is not supported")
class NoCloseStream(object):
def __init__(self, fp):
self.fp = fp
def __getattr__(self, name):
return getattr(self.fp, name)
def close(self):
pass
base_fp = fp base_fp = fp
wrapped_fp = False
if fp != sys.stdout: if fp != sys.stdout:
fp = NoCloseStream(fp)
if sys.version_info.major > 2: if sys.version_info.major > 2:
fp = io.TextIOWrapper(fp, encoding='latin-1') fp = io.TextIOWrapper(fp, encoding='latin-1')
wrapped_fp = True
try:
if eps:
#
# write EPS header
fp.write("%!PS-Adobe-3.0 EPSF-3.0\n")
fp.write("%%Creator: PIL 0.1 EpsEncode\n")
# fp.write("%%CreationDate: %s"...)
fp.write("%%%%BoundingBox: 0 0 %d %d\n" % im.size)
fp.write("%%Pages: 1\n")
fp.write("%%EndComments\n")
fp.write("%%Page: 1 1\n")
fp.write("%%ImageData: %d %d " % im.size)
fp.write("%d %d 0 1 1 \"%s\"\n" % operator)
if eps:
# #
# write EPS header # image header
fp.write("%!PS-Adobe-3.0 EPSF-3.0\n") fp.write("gsave\n")
fp.write("%%Creator: PIL 0.1 EpsEncode\n") fp.write("10 dict begin\n")
# fp.write("%%CreationDate: %s"...) fp.write("/buf %d string def\n" % (im.size[0] * operator[1]))
fp.write("%%%%BoundingBox: 0 0 %d %d\n" % im.size) fp.write("%d %d scale\n" % im.size)
fp.write("%%Pages: 1\n") fp.write("%d %d 8\n" % im.size) # <= bits
fp.write("%%EndComments\n") fp.write("[%d 0 0 -%d 0 %d]\n" % (im.size[0], im.size[1], im.size[1]))
fp.write("%%Page: 1 1\n") fp.write("{ currentfile buf readhexstring pop } bind\n")
fp.write("%%ImageData: %d %d " % im.size) fp.write(operator[2] + "\n")
fp.write("%d %d 0 1 1 \"%s\"\n" % operator) if hasattr(fp, "flush"):
fp.flush()
# ImageFile._save(im, base_fp, [("eps", (0, 0)+im.size, 0, None)])
# image header
fp.write("gsave\n")
fp.write("10 dict begin\n")
fp.write("/buf %d string def\n" % (im.size[0] * operator[1]))
fp.write("%d %d scale\n" % im.size)
fp.write("%d %d 8\n" % im.size) # <= bits
fp.write("[%d 0 0 -%d 0 %d]\n" % (im.size[0], im.size[1], im.size[1]))
fp.write("{ currentfile buf readhexstring pop } bind\n")
fp.write(operator[2] + "\n")
if hasattr(fp, "flush"):
fp.flush()
ImageFile._save(im, base_fp, [("eps", (0, 0)+im.size, 0, None)]) fp.write("\n%%%%EndBinary\n")
fp.write("grestore end\n")
fp.write("\n%%%%EndBinary\n") if hasattr(fp, "flush"):
fp.write("grestore end\n") fp.flush()
if hasattr(fp, "flush"): finally:
fp.flush() if wrapped_fp:
fp.detach()
# #
# -------------------------------------------------------------------- # --------------------------------------------------------------------