Merge pull request #3131 from tacaswell/unichr_cleanup

pelson · pelson · commit 0b481b579e31 · 2014-06-10T13:44:44.000+01:00
DOC : sixify unichr
diff --git a/examples/pylab_examples/font_table_ttf.py b/examples/pylab_examples/font_table_ttf.py
@@ -16,11 +16,8 @@
 from matplotlib.font_manager import FontProperties
 from pylab import figure, table, show, axis, title
 
-try:
-    unichr
-except NameError:
-    # Python 3
-    unichr = chr
+import six
+from six import unichr
 
 # the font table grid
 
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -19,12 +19,9 @@
 import zlib
 
 import numpy as np
+from six import unichr
+from six import BytesIO
 
-if six.PY3:
-    from io import BytesIO
-    unichr = chr
-else:
-    from cStringIO import StringIO as BytesIO
 from datetime import datetime
 from math import ceil, cos, floor, pi, sin
 try:
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -2,7 +2,7 @@
                         unicode_literals)
 
 import six
-
+from six import unichr
 import os
 import re
 import signal
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -3,8 +3,7 @@
 
 import six
 from six.moves import xrange
-if six.PY3:
-    unichr = chr
+from six import unichr
 
 import os, base64, tempfile, gzip, io, sys, codecs, re
 
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -23,8 +23,7 @@
 import six
 
 import os, sys
-if six.PY3:
-    unichr = chr
+from six import unichr
 from math import ceil
 try:
     set
diff --git a/lib/matplotlib/tests/test_backend_qt4.py b/lib/matplotlib/tests/test_backend_qt4.py
@@ -2,7 +2,7 @@
                         unicode_literals)
 
 import six
-
+from six import unichr
 from matplotlib import pyplot as plt
 from matplotlib.testing.decorators import cleanup
 from matplotlib.testing.decorators import knownfailureif
diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py
@@ -27,8 +27,7 @@
 
 import six
 from six.moves import filter
-if six.PY3:
-    unichr = chr
+from six import unichr
 
 import io
 import itertools
