Merge pull request #15940 from anntzer/unicode

dstansby · web-flow · commit d3603bfd1559 · 2019-12-29T10:40:42.000Z
Some unicode-support related cleanups.
diff --git a/examples/text_labels_and_annotations/tex_demo.py b/examples/text_labels_and_annotations/tex_demo.py
@@ -3,17 +3,16 @@
 Rendering math equations using TeX
 ==================================
 
-You can use TeX to render all of your matplotlib text if the rc
-parameter ``text.usetex`` is set.  This works currently on the agg and ps
-backends, and requires that you have tex and the other dependencies
-described in the :doc:`/tutorials/text/usetex` tutorial
-properly installed on your system.  The first time you run a script
-you will see a lot of output from tex and associated tools.  The next
-time, the run may be silent, as a lot of the information is cached.
-
-Notice how the label for the y axis is provided using unicode!
-
+You can use TeX to render all of your Matplotlib text by setting
+:rc:`text.usetex` to True.  This requires that you have TeX and the other
+dependencies described in the :doc:`/tutorials/text/usetex` tutorial properly
+installed on your system.  Matplotlib caches processed TeX expressions, so that
+only the first occurrence of an expression triggers a TeX compilation. Later
+occurrences reuse the rendered image from the cache and are thus faster.
+
+Unicode input is supported, e.g. for the y-axis label in this example.
 """
+
 import numpy as np
 import matplotlib
 matplotlib.rcParams['text.usetex'] = True
diff --git a/lib/matplotlib/_layoutbox.py b/lib/matplotlib/_layoutbox.py
@@ -72,32 +72,31 @@ def __init__(self, parent=None, name='', tightwidth=False,
         # keep track of whether we need to match this subplot up with others.
         self.subplot = subplot
 
-        # we need the str below for Py 2 which complains the string is unicode
-        self.top = Variable(str(sn + 'top'))
-        self.bottom = Variable(str(sn + 'bottom'))
-        self.left = Variable(str(sn + 'left'))
-        self.right = Variable(str(sn + 'right'))
-
-        self.width = Variable(str(sn + 'width'))
-        self.height = Variable(str(sn + 'height'))
-        self.h_center = Variable(str(sn + 'h_center'))
-        self.v_center = Variable(str(sn + 'v_center'))
-
-        self.min_width = Variable(str(sn + 'min_width'))
-        self.min_height = Variable(str(sn + 'min_height'))
-        self.pref_width = Variable(str(sn + 'pref_width'))
-        self.pref_height = Variable(str(sn + 'pref_height'))
+        self.top = Variable(sn + 'top')
+        self.bottom = Variable(sn + 'bottom')
+        self.left = Variable(sn + 'left')
+        self.right = Variable(sn + 'right')
+
+        self.width = Variable(sn + 'width')
+        self.height = Variable(sn + 'height')
+        self.h_center = Variable(sn + 'h_center')
+        self.v_center = Variable(sn + 'v_center')
+
+        self.min_width = Variable(sn + 'min_width')
+        self.min_height = Variable(sn + 'min_height')
+        self.pref_width = Variable(sn + 'pref_width')
+        self.pref_height = Variable(sn + 'pref_height')
         # margins are only used for axes-position layout boxes.  maybe should
         # be a separate subclass:
-        self.left_margin = Variable(str(sn + 'left_margin'))
-        self.right_margin = Variable(str(sn + 'right_margin'))
-        self.bottom_margin = Variable(str(sn + 'bottom_margin'))
-        self.top_margin = Variable(str(sn + 'top_margin'))
+        self.left_margin = Variable(sn + 'left_margin')
+        self.right_margin = Variable(sn + 'right_margin')
+        self.bottom_margin = Variable(sn + 'bottom_margin')
+        self.top_margin = Variable(sn + 'top_margin')
         # mins
-        self.left_margin_min = Variable(str(sn + 'left_margin_min'))
-        self.right_margin_min = Variable(str(sn + 'right_margin_min'))
-        self.bottom_margin_min = Variable(str(sn + 'bottom_margin_min'))
-        self.top_margin_min = Variable(str(sn + 'top_margin_min'))
+        self.left_margin_min = Variable(sn + 'left_margin_min')
+        self.right_margin_min = Variable(sn + 'right_margin_min')
+        self.bottom_margin_min = Variable(sn + 'bottom_margin_min')
+        self.top_margin_min = Variable(sn + 'top_margin_min')
 
         right, top = upper_right
         left, bottom = lower_left
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -1362,10 +1362,7 @@ def set_xscale(self, scale, *args, **kwargs):
                 "You can not set the xscale on a polar plot.")
 
     def format_coord(self, theta, r):
-        """
-        Return a format string formatting the coordinate using Unicode
-        characters.
-        """
+        # docstring inherited
         if theta < 0:
             theta += 2 * np.pi
         theta /= np.pi
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -169,12 +169,8 @@ def animate(i):
     # per frame with known names.
     with tmpdir.as_cwd():
         anim = animation.FuncAnimation(fig, animate, init_func=init, frames=5)
-        try:
-            anim.save(output, fps=30, writer=writer, bitrate=500, dpi=dpi,
-                      codec=codec)
-        except UnicodeDecodeError:
-            pytest.xfail("There can be errors in the numpy import stack, "
-                         "see issues #1891 and #2679")
+        anim.save(output, fps=30, writer=writer, bitrate=500, dpi=dpi,
+                  codec=codec)
 
 
 def test_no_length_frames():
