Merge pull request #10481 from jkseppan/dviread-python3

jkseppan · web-flow · commit 2bd942c6bf1f · 2018-02-16T09:01:53.000+02:00
Remove python 2 compatibility code from dviread
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -17,13 +17,8 @@
               ...
 
 """
-from __future__ import absolute_import, division, print_function
-
-import six
-from six.moves import xrange
-
 from collections import namedtuple
-from functools import partial, wraps
+from functools import lru_cache, partial, wraps
 import logging
 import numpy as np
 import os
@@ -35,15 +30,6 @@
 from matplotlib import cbook, rcParams
 from matplotlib.compat import subprocess
 
-try:
-    from functools import lru_cache
-except ImportError:  # Py2
-    from backports.functools_lru_cache import lru_cache
-
-if six.PY3:
-    def ord(x):
-        return x
-
 _log = logging.getLogger(__name__)
 
 # Dvi is a bytecode format documented in
@@ -172,7 +158,7 @@ def wrapper(self, byte):
         if max is None:
             table[min] = wrapper
         else:
-            for i in xrange(min, max+1):
+            for i in range(min, max+1):
                 assert table[i] is None
                 table[i] = wrapper
         return wrapper
@@ -194,7 +180,7 @@ class Dvi(object):
     >>>         print(''.join(unichr(t.glyph) for t in page.text))
     """
     # dispatch table
-    _dtable = [None for _ in xrange(256)]
+    _dtable = [None] * 256
     _dispatch = partial(_dispatch, _dtable)
 
     def __init__(self, filename, dpi):
@@ -311,7 +297,7 @@ def _read(self):
         False if there were no more pages.
         """
         while True:
-            byte = ord(self.file.read(1)[0])
+            byte = self.file.read(1)[0]
             self._dtable[byte](self, byte)
             if byte == 140:                         # end of page
                 return True
@@ -325,11 +311,11 @@ def _arg(self, nbytes, signed=False):
         Signedness is determined by the *signed* keyword.
         """
         str = self.file.read(nbytes)
-        value = ord(str[0])
+        value = str[0]
         if signed and value >= 0x80:
             value = value - 0x100
         for i in range(1, nbytes):
-            value = 0x100*value + ord(str[i])
+            value = 0x100*value + str[i]
         return value
 
     @_dispatch(min=0, max=127, state=_dvistate.inpage)
@@ -445,14 +431,9 @@ def _fnt_num(self, new_f):
     @_dispatch(min=239, max=242, args=('ulen1',))
     def _xxx(self, datalen):
         special = self.file.read(datalen)
-        if six.PY3:
-            chr_ = chr
-        else:
-            def chr_(x):
-                return x
         _log.debug(
             'Dvi._xxx: encountered special: %s',
-            ''.join([chr_(ch) if 32 <= ord(ch) < 127 else '<%02x>' % ord(ch)
+            ''.join([chr(ch) if 32 <= ch < 127 else '<%02x>' % ch
                      for ch in special]))
 
     @_dispatch(min=243, max=246, args=('olen1', 'u4', 'u4', 'u4', 'u1', 'u1'))
@@ -464,11 +445,7 @@ def _fnt_def_real(self, k, c, s, d, a, l):
         fontname = n[-l:].decode('ascii')
         tfm = _tfmfile(fontname)
         if tfm is None:
-            if six.PY2:
-                error_class = OSError
-            else:
-                error_class = FileNotFoundError
-            raise error_class("missing font metrics file: %s" % fontname)
+            raise FileNotFoundError("missing font metrics file: %s" % fontname)
         if c != 0 and tfm.checksum != 0 and c != tfm.checksum:
             raise ValueError('tfm checksum mismatch: %s' % n)
 
@@ -561,7 +538,7 @@ def __init__(self, scale, tfm, texname, vf):
         except ValueError:
             nchars = 0
         self.widths = [(1000*tfm.width.get(char, 0)) >> 20
-                       for char in xrange(nchars)]
+                       for char in range(nchars)]
 
     def __eq__(self, other):
         return self.__class__ == other.__class__ and \
@@ -643,7 +620,7 @@ def _read(self):
         packet_char, packet_ends = None, None
         packet_len, packet_width = None, None
         while True:
-            byte = ord(self.file.read(1)[0])
+            byte = self.file.read(1)[0]
             # If we are in a packet, execute the dvi instructions
             if self.state == _dvistate.inpage:
                 byte_at = self.file.tell()-1
@@ -774,9 +751,9 @@ def __init__(self, filename):
         widths, heights, depths = \
             [struct.unpack('!%dI' % (len(x)/4), x)
              for x in (widths, heights, depths)]
-        for idx, char in enumerate(xrange(bc, ec+1)):
-            byte0 = ord(char_info[4*idx])
-            byte1 = ord(char_info[4*idx+1])
+        for idx, char in enumerate(range(bc, ec+1)):
+            byte0 = char_info[4*idx]
+            byte1 = char_info[4*idx+1]
             self.width[char] = _fix2comp(widths[byte0])
             self.height[char] = _fix2comp(heights[byte1 >> 4])
             self.depth[char] = _fix2comp(depths[byte1 & 0xf])
@@ -836,7 +813,7 @@ class PsfontsMap(object):
     def __init__(self, filename):
         self._font = {}
         self._filename = filename
-        if six.PY3 and isinstance(filename, bytes):
+        if isinstance(filename, bytes):
             encoding = sys.getfilesystemencoding() or 'utf-8'
             self._filename = filename.decode(encoding, errors='replace')
         with open(filename, 'rb') as file:
@@ -1024,25 +1001,19 @@ def find_tex_file(filename, format=None):
         The library that :program:`kpsewhich` is part of.
     """
 
-    if six.PY3:
-        # we expect these to always be ascii encoded, but use utf-8
-        # out of caution
-        if isinstance(filename, bytes):
-            filename = filename.decode('utf-8', errors='replace')
-        if isinstance(format, bytes):
-            format = format.decode('utf-8', errors='replace')
+    # we expect these to always be ascii encoded, but use utf-8
+    # out of caution
+    if isinstance(filename, bytes):
+        filename = filename.decode('utf-8', errors='replace')
+    if isinstance(format, bytes):
+        format = format.decode('utf-8', errors='replace')
 
     cmd = ['kpsewhich']
     if format is not None:
         cmd += ['--format=' + format]
     cmd += [filename]
     _log.debug('find_tex_file(%s): %s', filename, cmd)
-    # stderr is unused, but reading it avoids a subprocess optimization
-    # that breaks EINTR handling in some Python versions:
-    # http://bugs.python.org/issue12493
-    # https://github.com/matplotlib/matplotlib/issues/633
-    pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE)
+    pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE)
     result = pipe.communicate()[0].rstrip()
     _log.debug('find_tex_file result: %s', result)
     return result.decode('ascii')
diff --git a/lib/matplotlib/tests/test_dviread.py b/lib/matplotlib/tests/test_dviread.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
-import six
 from matplotlib.testing.decorators import skip_if_command_unavailable
 
 import matplotlib.dviread as dr
@@ -64,7 +61,7 @@ def test_dviread():
                              for [a, b, c, d, e] in entry['text']]
     with dr.Dvi(os.path.join(dir, 'test.dvi'), None) as dvi:
         data = [{'text': [[t.x, t.y,
-                           six.unichr(t.glyph),
+                           chr(t.glyph),
                            t.font.texname,
                            round(t.font.size, 2)]
                           for t in page.text],
