Merge pull request #17215 from anntzer/ps

QuLogic · web-flow · commit a769d641e718 · 2020-04-22T17:24:10.000-04:00
Small cleanups.
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -446,14 +446,12 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
                 linewidths, linestyles, antialiaseds, urls,
                 offset_position)
 
-        write = self._pswriter.write
-
         path_codes = []
         for i, (path, transform) in enumerate(self._iter_collection_raw_paths(
                 master_transform, paths, all_transforms)):
             name = 'p%x_%x' % (self._path_collection_id, i)
             path_bytes = self._convert_path(path, transform, simplify=False)
-            write(f"""\
+            self._pswriter.write(f"""\
 /{name} {{
 newpath
 translate
@@ -510,10 +508,8 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         # docstring inherited
 
-        # local to avoid repeated attribute lookups
-        write = self._pswriter.write
         if debugPS:
-            write("% text\n")
+            self._pswriter.write("% text\n")
 
         if _is_transparent(gc.get_rgb()):
             return  # Special handling for fully transparent.
@@ -941,10 +937,7 @@ def print_figure_impl(fh):
                   file=fh)
 
             # write the figure
-            content = self._pswriter.getvalue()
-            if not isinstance(content, str):
-                content = content.decode('ascii')
-            print(content, file=fh)
+            print(self._pswriter.getvalue(), file=fh)
 
             # write the trailer
             print("end", file=fh)
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -1,8 +1,8 @@
 r"""
-`~matplotlib.mathtext` is a module for parsing a subset of the
-TeX math syntax and drawing them to a matplotlib backend.
+A module for parsing a subset of the TeX math syntax and rendering it to a
+Matplotlib backend.
 
-For a tutorial of its usage see :doc:`/tutorials/text/mathtext`.  This
+For a tutorial of its usage, see :doc:`/tutorials/text/mathtext`.  This
 document is primarily concerned with implementation details.
 
 The module uses pyparsing_ to parse the TeX expression.
@@ -231,8 +231,7 @@ def __init__(self):
     def render_glyph(self, ox, oy, info):
         oy = self.height - oy + info.offset
         postscript_name = info.postscript_name
-        fontsize        = info.fontsize
-        symbol_name     = info.symbol_name
+        fontsize = info.fontsize
 
         if (postscript_name, fontsize) != self.lastfont:
             self.lastfont = postscript_name, fontsize
@@ -243,7 +242,7 @@ def render_glyph(self, ox, oy, info):
 
         self.pswriter.write(
             f"{ox:f} {oy:f} moveto\n"
-            f"/{symbol_name} glyphshow\n")
+            f"/{info.symbol_name} glyphshow\n")
 
     def render_rect_filled(self, x1, y1, x2, y2):
         ps = "%f %f %f %f rectfill\n" % (
