Merge pull request #11401 from anntzer/py3

jklymak · web-flow · commit 7b066c60bbe2 · 2018-07-04T11:18:15.000-07:00
Some py3fications.
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1,4 +1,4 @@
-from itertools import chain, product
+from itertools import product
 from distutils.version import LooseVersion
 import io
 
@@ -357,7 +357,7 @@ def test_arrow_simple():
     shape = ('full', 'left', 'right')
     head_starts_at_zero = (True, False)
     # Create outer product of values
-    kwargs = list(product(length_includes_head, shape, head_starts_at_zero))
+    kwargs = product(length_includes_head, shape, head_starts_at_zero)
 
     fig, axs = plt.subplots(3, 4)
     for i, (ax, kwarg) in enumerate(zip(axs.flatten(), kwargs)):
@@ -5041,9 +5041,7 @@ def generate_errorbar_inputs():
     yerr_only = base_xy * yerr_cy
     both_err = base_xy * yerr_cy * xerr_cy
 
-    test_cyclers = chain(xerr_only, yerr_only, both_err, empty)
-
-    return test_cyclers
+    return [*xerr_only, *yerr_only, *both_err, *empty]
 
 
 @pytest.mark.parametrize('kwargs', generate_errorbar_inputs())
diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py
@@ -243,14 +243,13 @@ def _transformer(cls, tokens, slant, extend):
         def fontname(name):
             result = name
             if slant:
-                result += b'_Slant_' + str(int(1000 * slant)).encode('ascii')
+                result += b'_Slant_%d' % int(1000 * slant)
             if extend != 1.0:
-                result += b'_Extend_' + str(int(1000 * extend)).encode('ascii')
+                result += b'_Extend_%d' % int(1000 * extend)
             return result
 
         def italicangle(angle):
-            return (str(float(angle) - np.arctan(slant) / np.pi * 180)
-                    .encode('ascii'))
+            return b'%a' % (float(angle) - np.arctan(slant) / np.pi * 180)
 
         def fontmatrix(array):
             array = array.lstrip(b'[').rstrip(b']').split()
@@ -264,19 +263,21 @@ def fontmatrix(array):
             newmatrix = np.dot(modifier, oldmatrix)
             array[::2] = newmatrix[0:3, 0]
             array[1::2] = newmatrix[0:3, 1]
+            # Not directly using `b'%a' % x for x in array` for now as that
+            # produces longer reprs on numpy<1.14, causing test failures.
             as_string = '[' + ' '.join(str(x) for x in array) + ']'
             return as_string.encode('latin-1')
 
         def replace(fun):
             def replacer(tokens):
                 token, value = next(tokens)      # name, e.g., /FontMatrix
-                yield bytes(value)
+                yield value
                 token, value = next(tokens)      # possible whitespace
                 while token is _TokenType.whitespace:
-                    yield bytes(value)
+                    yield value
                     token, value = next(tokens)
                 if value != b'[':                # name/number/etc.
-                    yield bytes(fun(value))
+                    yield fun(value)
                 else:                            # array, e.g., [1 2 3]
                     result = b''
                     while value != b']':
@@ -298,9 +299,8 @@ def suppress(tokens):
 
         for token, value in tokens:
             if token is _TokenType.name and value in table:
-                for value in table[value](itertools.chain([(token, value)],
-                                                          tokens)):
-                    yield value
+                yield from table[value](
+                    itertools.chain([(token, value)], tokens))
             else:
                 yield value
 
