First pass at PS backend.

astropy-buildbot · astropy-buildbot · commit 7fdae0a73c95 · 2011-02-22T15:54:23.000-05:00
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -2,17 +2,19 @@
 A PostScript backend, which can produce both PostScript .ps and .eps
 """
 
+# PY3KTODO: Get rid of "print >>fh" syntax
+
 from __future__ import division
 import glob, math, os, shutil, sys, time
 def _fn_name(): return sys._getframe(1).f_code.co_name
+import io
 
 try:
     from hashlib import md5
 except ImportError:
     from md5 import md5 #Deprecated in 2.5
 
 from tempfile import mkstemp
-from cStringIO import StringIO
 from matplotlib import verbose, __version__, rcParams
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.afm import AFM
@@ -322,7 +324,7 @@ def _get_font_afm(self, prop):
                     "Helvetica", fontext='afm', directory=self._afm_font_dir)
             font = self.afmfontd.get(fname)
             if font is None:
-                font = AFM(file(fname))
+                font = AFM(open(fname, 'rb'))
                 self.afmfontd[fname] = font
             self.afmfontd[key] = font
         return font
@@ -945,7 +947,8 @@ def _print_figure(self, outfile, format, dpi=72, facecolor='w', edgecolor='w',
             raise ValueError("outfile must be a path or a file-like object")
 
         fd, tmpfile = mkstemp()
-        fh = os.fdopen(fd, 'w')
+        raw_fh = os.fdopen(fd, 'wb')
+        fh = io.TextIOWrapper(raw_fh, encoding="ascii")
 
         # find the appropriate papertype
         width, height = self.figure.get_size_inches()
@@ -998,7 +1001,7 @@ def write(self, *kl, **kwargs):
 
             self._pswriter = NullWriter()
         else:
-            self._pswriter = StringIO()
+            self._pswriter = io.StringIO()
 
 
         # mixed mode rendering
@@ -1064,7 +1067,8 @@ def write(self, *kl, **kwargs):
                     if is_opentype_cff_font(font_filename):
                         raise RuntimeError("OpenType CFF fonts can not be saved using the internal Postscript backend at this time.\nConsider using the Cairo backend.")
                     else:
-                        convert_ttf_to_ps(font_filename, fh, fonttype, glyph_ids)
+                        fh.flush()
+                        convert_ttf_to_ps(font_filename, raw_fh, fonttype, glyph_ids)
         print >>fh, "end"
         print >>fh, "%%EndProlog"
 
@@ -1091,7 +1095,7 @@ def write(self, *kl, **kwargs):
             xpdf_distill(tmpfile, isEPSF, ptype=papertype, bbox=bbox)
 
         if passed_in_file_object:
-            fh = open(tmpfile)
+            fh = open(tmpfile, 'rb')
             print >>outfile, fh.read()
         else:
             open(outfile, 'w')
@@ -1112,7 +1116,7 @@ def _print_figure_tex(self, outfile, format, dpi, facecolor, edgecolor,
 
         # write to a temp file, we'll move it to outfile when done
         fd, tmpfile = mkstemp()
-        fh = os.fdopen(fd, 'w')
+        fh = io.fdopen(fd, 'w', encoding='ascii')
 
         self.figure.dpi = 72 # ignore the dpi kwarg
         width, height = self.figure.get_size_inches()
@@ -1239,10 +1243,10 @@ def write(self, *kl, **kwargs):
                              rotated=psfrag_rotated)
 
         if  isinstance(outfile, file):
-            fh = file(tmpfile)
-            print >>outfile, fh.read()
+            fh = open(tmpfile, 'rb')
+            outfile.write(fh.read())
         else:
-            open(outfile, 'w')
+            open(outfile, 'wb')
             mode = os.stat(outfile).st_mode
             shutil.move(tmpfile, outfile)
             os.chmod(outfile, mode)
@@ -1261,7 +1265,7 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
     shutil.move(tmpfile, epsfile)
     latexfile = tmpfile+'.tex'
     outfile = tmpfile+'.output'
-    latexh = file(latexfile, 'w')
+    latexh = io.open(latexfile, 'w', encoding='ascii')
     dvifile = tmpfile+'.dvi'
     psfile = tmpfile+'.ps'
 
@@ -1316,7 +1320,7 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
                 %(precmd, tmpdir, latexfile, outfile)
     verbose.report(command, 'debug')
     exit_status = os.system(command)
-    fh = file(outfile)
+    fh = io.open(outfile, 'rb')
     if exit_status:
         raise RuntimeError('LaTeX was not able to process your file:\
 \nHere is the full report generated by LaTeX: \n\n%s'% fh.read())
@@ -1328,7 +1332,7 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
                 os.path.split(psfile)[-1], os.path.split(dvifile)[-1], outfile)
     verbose.report(command, 'debug')
     exit_status = os.system(command)
-    fh = file(outfile)
+    fh = io.open(outfile, 'rb')
     if exit_status: raise RuntimeError('dvips was not able to \
 process the following file:\n%s\nHere is the full report generated by dvips: \
 \n\n'% dvifile + fh.read())
@@ -1376,7 +1380,7 @@ def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
                 "%s" > "%s"'% (gs_exe, dpi, paper_option, psfile, tmpfile, outfile)
     verbose.report(command, 'debug')
     exit_status = os.system(command)
-    fh = file(outfile)
+    fh = io.open(outfile, 'rb')
     if exit_status: raise RuntimeError('ghostscript was not able to process \
 your image.\nHere is the full report generated by ghostscript:\n\n' + fh.read())
     else: verbose.report(fh.read(), 'debug')
@@ -1406,7 +1410,7 @@ def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     if sys.platform == 'win32': command = command.replace('=', '#')
     verbose.report(command, 'debug')
     exit_status = os.system(command)
-    fh = file(outfile)
+    fh = io.open(outfile, 'rb')
     if exit_status: raise RuntimeError('ps2pdf was not able to process your \
 image.\n\Here is the report generated by ghostscript:\n\n' + fh.read())
     else: verbose.report(fh.read(), 'debug')
@@ -1416,7 +1420,7 @@ def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
                 (pdffile, psfile, outfile)
     verbose.report(command, 'debug')
     exit_status = os.system(command)
-    fh = file(outfile)
+    fh = io.open(outfile, 'rb')
     if exit_status: raise RuntimeError('pdftops was not able to process your \
 image.\nHere is the full report generated by pdftops: \n\n' + fh.read())
     else: verbose.report(fh.read(), 'debug')
@@ -1499,9 +1503,9 @@ def pstoeps(tmpfile, bbox, rotated=False):
     bbox_info, rotate = get_bbox_header(bbox, rotated=rotated)
 
     epsfile = tmpfile + '.eps'
-    epsh = file(epsfile, 'w')
+    epsh = io.open(epsfile, 'w', encoding='ascii')
 
-    tmph = file(tmpfile)
+    tmph = io.open(tmpfile, 'r', encoding='ascii')
     line = tmph.readline()
     # Modify the header:
     while line:
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -48,7 +48,11 @@ class PythonFileWriter : public TTStreamWriter
         PyObject* result = NULL;
         if (_write_method)
         {
+            #if PY3K
+            result = PyObject_CallFunction(_write_method, (char *)"y", a);
+            #else
             result = PyObject_CallFunction(_write_method, (char *)"s", a);
+            #endif
             if (! result)
             {
                 throw PythonExceptionOccurred();

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,11 @@ class PythonFileWriter : public TTStreamWriter`
`48`	`48`	`PyObject* result = NULL;`
`49`	`49`	`if (_write_method)`
`50`	`50`	`{`
	`51`	`+ #if PY3K`
	`52`	`+ result = PyObject_CallFunction(_write_method, (char *)"y", a);`
	`53`	`+ #else`
`51`	`54`	`result = PyObject_CallFunction(_write_method, (char *)"s", a);`
	`55`	`+ #endif`
`52`	`56`	`if (! result)`
`53`	`57`	`{`
`54`	`58`	`throw PythonExceptionOccurred();`