Use \N{} unicode entities.

anntzer · anntzer · commit 179b3edf201f · 2016-12-01T23:07:10.000-08:00
diff --git a/examples/api/custom_projection_example.py b/examples/api/custom_projection_example.py
@@ -48,7 +48,7 @@ def __call__(self, x, pos=None):
             if rcParams['text.usetex'] and not rcParams['text.latex.unicode']:
                 return r"$%0.0f^\circ$" % degrees
             else:
-                return "%0.0f\u00b0" % degrees
+                return "%0.0f\N{DEGREE SIGN}" % degrees
 
     RESOLUTION = 75
 
@@ -288,7 +288,8 @@ def format_coord(self, lon, lat):
             ew = 'E'
         else:
             ew = 'W'
-        return '%f\u00b0%s, %f\u00b0%s' % (abs(lat), ns, abs(lon), ew)
+        return ('%f\N{DEGREE SIGN}%s, %f\N{DEGREE SIGN}%s'
+                % (abs(lat), ns, abs(lon), ew))
 
     def set_longitude_grid(self, degrees):
         """
diff --git a/examples/api/custom_scale_example.py b/examples/api/custom_scale_example.py
@@ -86,8 +86,7 @@ def set_default_locators_and_formatters(self, axis):
         """
         class DegreeFormatter(Formatter):
             def __call__(self, x, pos=None):
-                # \u00b0 : degree symbol
-                return "%d\u00b0" % (np.degrees(x))
+                return "%d\N{DEGREE SIGN}" % np.degrees(x)
 
         axis.set_major_locator(FixedLocator(
             np.radians(np.arange(-90, 90, 10))))
diff --git a/examples/pylab_examples/tex_unicode_demo.py b/examples/pylab_examples/tex_unicode_demo.py
@@ -18,7 +18,7 @@
 plt.plot(t, s)
 
 plt.xlabel(r'\textbf{time (s)}')
-plt.ylabel('\\textit{Velocity (\u00B0/sec)}', fontsize=16)
+plt.ylabel('\\textit{Velocity (\N{DEGREE SIGN}/sec)}', fontsize=16)
 plt.title(r'\TeX\ is Number $\displaystyle\sum_{n=1}^\infty'
           r'\frac{-e^{i\pi}}{2^n}$!', fontsize=16, color='r')
 plt.grid(True)
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1008,7 +1008,7 @@ def embedTTFType42(font, characters, descriptor):
 
             # Make the 'W' (Widths) array, CidToGidMap and ToUnicode CMap
             # at the same time
-            cid_to_gid_map = ['\u0000'] * 65536
+            cid_to_gid_map = ['\0'] * 65536
             widths = []
             max_ccode = 0
             for c in characters:
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
@@ -38,7 +38,7 @@ def __call__(self, x, pos=None):
             if rcParams['text.usetex'] and not rcParams['text.latex.unicode']:
                 return r"$%0.0f^\circ$" % degrees
             else:
-                return "%0.0f\u00b0" % degrees
+                return "%0.0f\N{DEGREE SIGN}" % degrees
 
     RESOLUTION = 75
 
@@ -184,7 +184,8 @@ def format_coord(self, lon, lat):
             ew = 'E'
         else:
             ew = 'W'
-        return '%f\u00b0%s, %f\u00b0%s' % (abs(lat), ns, abs(lon), ew)
+        return ('%f\N{DEGREE SIGN}%s, %f\N{DEGREE SIGN}%s'
+                % (abs(lat), ns, abs(lon), ew))
 
     def set_longitude_grid(self, degrees):
         """
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -172,7 +172,6 @@ class ThetaFormatter(Formatter):
     unit of radians into degrees and adds a degree symbol.
     """
     def __call__(self, x, pos=None):
-        # \u00b0 : degree symbol
         if rcParams['text.usetex'] and not rcParams['text.latex.unicode']:
             return r"$%0.0f^\circ$" % ((x / np.pi) * 180.0)
         else:
@@ -181,7 +180,7 @@ def __call__(self, x, pos=None):
             # (assuming it has a degree sign), whereas $5\circ$
             # will only work correctly with one of the supported
             # math fonts (Computer Modern and STIX)
-            return "%0.0f\u00b0" % ((x / np.pi) * 180.0)
+            return "%0.0f\N{DEGREE SIGN}" % ((x / np.pi) * 180.0)
 
 
 class RadialLocator(Locator):
@@ -592,10 +591,8 @@ def format_coord(self, theta, r):
         characters.
         """
         theta /= math.pi
-        # \u03b8: lower-case theta
-        # \u03c0: lower-case pi
-        # \u00b0: degree symbol
-        return '\u03b8=%0.3f\u03c0 (%0.3f\u00b0), r=%0.3f' % (theta, theta * 180.0, r)
+        return ('\N{GREEK SMALL LETTER THETA}=%0.3f\N{GREEK SMALL LETTER PI} '
+                '(%0.3f\N{DEGREE SIGN}), r=%0.3f') % (theta, theta * 180.0, r)
 
     def get_data_ratio(self):
         '''
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -113,15 +113,6 @@ def test_imread_pil_uint16():
     assert (img.dtype == np.uint16)
     assert np.sum(img) == 134184960
 
-# def test_image_unicode_io():
-#     fig = plt.figure()
-#     ax = fig.add_subplot(111)
-#     ax.plot([1,2,3])
-#     fname = u"\u0a3a\u0a3a.png"
-#     fig.savefig(fname)
-#     plt.imread(fname)
-#     os.remove(fname)
-
 
 @cleanup
 def test_imsave():
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -579,7 +579,7 @@ def fix_minus(self, s):
         if rcParams['text.usetex'] or not rcParams['axes.unicode_minus']:
             return s
         else:
-            return s.replace('-', '\u2212')
+            return s.replace('-', '\N{MINUS SIGN}')
 
     def __call__(self, x, pos=None):
         """
@@ -1133,7 +1133,7 @@ class EngFormatter(Formatter):
         -15: "f",
         -12: "p",
          -9: "n",
-         -6: "\u03bc",
+         -6: "\N{GREEK SMALL LETTER MU}",
          -3: "m",
           0: "",
           3: "k",
@@ -1167,7 +1167,7 @@ def format_eng(self, num):
         '1.0 M'
 
         >>> format_eng("-1e-6") # for self.places = 2
-        u'-1.00 \u03bc'
+        u'-1.00 \N{GREEK SMALL LETTER MU}'
 
         `num` may be a numeric value or a string that can be converted
         to a numeric value with the `decimal.Decimal` constructor.
diff --git a/tools/test_triage.py b/tools/test_triage.py
@@ -301,14 +301,11 @@ def display(self):
         Get the display string for this entry.  This is the text that
         appears in the list widget.
         """
-        status_map = {
-            'unknown': '\u2610',
-            'accept':  '\u2611',
-            'reject':  '\u2612'
-            }
+        status_map = {'unknown': '\N{BALLOT BOX}',
+                      'accept':  '\N{BALLOT BOX WITH CHECK}',
+                      'reject':  '\N{BALLOT BOX WITH X}'}
         box = status_map[self.status]
-        return '{} {} [{}]'.format(
-            box, self.name, self.extension)
+        return '{} {} [{}]'.format(box, self.name, self.extension)
 
     def accept(self):
         """
