8000 Minor refactor of backend_ps. by anntzer · Pull Request #10250 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Minor refactor of backend_ps. #10250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2018
Merged

Minor refactor of backend_ps. #10250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions lib/matplotlib/backends/backend_ps.py
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,25 @@ def quote_ps_string(s):
return s.decode('ascii')


def _move_path_to_path_or_stream(src, dst):
"""Move the contents of file at *src* to path-or-filelike *dst*.

If *dst* is a path, the metadata of *src* are *not* copied.
"""
if is_writable_file_like(dst):
fh = (io.open(src, 'r', encoding='latin-1')
if file_requires_unicode(dst)
else io.open(src, 'rb'))
with fh:
shutil.copyfileobj(fh, dst)
else:
# Py3: shutil.move(src, dst, copy_function=shutil.copyfile)
open(dst, 'w').close()
mode = os.stat(dst).st_mode
shutil.move(src, dst)
os.chmod(dst, mode)


class RendererPS(RendererBase):
"""
The renderer handles all the drawing primitives using a graphics
Expand Down Expand Up @@ -1153,18 +1172,7 @@ def print_figure_impl(fh):
elif rcParams['ps.usedistiller'] == 'xpdf':
xpdf_distill(tmpfile, isEPSF, ptype=papertype, bbox=bbox)

if passed_in_file_object:
fh = (io.open(tmpfile, 'r', encoding='latin-1')
if file_requires_unicode(outfile)
else io.open(tmpfile, 'rb'))
with fh:
shutil.copyfileobj(fh, outfile)
else:
with io.open(outfile, 'w') as fh:
pass
mode = os.stat(outfile).st_mode
shutil.move(tmpfile, outfile)
os.chmod(outfile, mode)
_move_path_to_path_or_stream(tmpfile, outfile)
finally:
if os.path.isfile(tmpfile):
os.unlink(tmpfile)
Expand Down Expand Up @@ -1329,10 +1337,9 @@ def write(self, *kl, **kwargs):
paperWidth, paperHeight = papersize[papertype]
if (width > paperWidth or height > paperHeight) and isEPSF:
paperWidth, paperHeight = papersize[temp_papertype]
_log.info(
A90F ('Your figure is too big to fit on %s paper. %s '
'paper will be used to prevent clipping.'
) % (papertype, temp_papertype))
_log.info('Your figure is too big to fit on %s paper. '
'%s paper will be used to prevent clipping.',
papertype, temp_papertype)

texmanager = ps_renderer.get_texmanager()
font_preamble = texmanager.get_font_preamble()
Expand All @@ -1352,17 +1359,7 @@ def write(self, *kl, **kwargs):
xpdf_distill(tmpfile, isEPSF, ptype=papertype, bbox=bbox,
rotated=psfrag_rotated)

if is_writable_file_like(outfile):
with (io.open(tmpfile, 'r', encoding='latin-1')
if file_requires_unicode(outfile)
else io.open(tmpfile, 'rb')) as fh:
shutil.copyfileobj(fh, outfile)
else:
with io.open(outfile, 'wb') as fh:
pass
mode = os.stat(outfile).st_mode
shutil.move(tmpfile, outfile)
os.chmod(outfile, mode)
_move_path_to_path_or_stream(tmpfile, outfile)
finally:
if os.path.isfile(tmpfile):
os.unlink(tmpfile)
Expand Down Expand Up @@ -1483,6 +1480,7 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,

return psfrag_rotated


def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
"""
Use ghostscript's pswrite or epswrite device to distill a file.
Expand Down
0