Small cleanups to dviread.

anntzer · anntzer · commit 8f498f41d3d4 · 2020-03-24T09:47:51.000+01:00
Don't use variables whose name shadow builtins (`bytes`, `str` -- the
latter is actually a bytes instance).  Also use a slightly more
idiomatic way to iterate over the bytestring.
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -73,12 +73,12 @@ def _arg_raw(dvi, delta):
     return delta
 
 
-def _arg(bytes, signed, dvi, _):
+def _arg(nbytes, signed, dvi, _):
     """
-    Read *bytes* bytes, returning the bytes interpreted as a signed integer
+    Read *nbytes* bytes, returning the bytes interpreted as a signed integer
     if *signed* is true, unsigned otherwise.
     """
-    return dvi._arg(bytes, signed)
+    return dvi._arg(nbytes, signed)
 
 
 def _arg_slen(dvi, delta):
@@ -315,12 +315,12 @@ def _arg(self, nbytes, signed=False):
         Read and return an integer argument *nbytes* long.
         Signedness is determined by the *signed* keyword.
         """
-        str = self.file.read(nbytes)
-        value = str[0]
+        buf = self.file.read(nbytes)
+        value = buf[0]
         if signed and value >= 0x80:
             value = value - 0x100
-        for i in range(1, nbytes):
-            value = 0x100*value + str[i]
+        for b in buf[1:]:
+            value = 0x100*value + b
         return value
 
     @_dispatch(min=0, max=127, state=_dvistate.inpage)
