From f9a67db89b508aaf3b97be42035729f11ba8e481 Mon Sep 17 00:00:00 2001 From: cybjit Date: Sun, 7 Sep 2014 18:36:12 +0200 Subject: [PATCH] change xrange to range --- pdfminer/cmapdb.py | 6 +++--- pdfminer/converter.py | 4 ++-- pdfminer/pdffont.py | 28 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pdfminer/cmapdb.py b/pdfminer/cmapdb.py index 1e1c94e..6dee4a7 100644 --- a/pdfminer/cmapdb.py +++ b/pdfminer/cmapdb.py @@ -358,7 +358,7 @@ class CMapParser(PSStackParser): e1 = nunpack(evar) vlen = len(svar) #assert s1 <= e1 - for i in xrange(e1-s1+1): + for i in range(e1-s1+1): x = sprefix+struct.pack('>L', s1+i)[-vlen:] self.cmap.add_code2cid(x, cid+i) return @@ -386,14 +386,14 @@ class CMapParser(PSStackParser): e1 = nunpack(e) #assert s1 <= e1 if isinstance(code, list): - for i in xrange(e1-s1+1): + for i in range(e1-s1+1): self.cmap.add_cid2unichr(s1+i, code[i]) else: var = code[-4:] base = nunpack(var) prefix = code[:-4] vlen = len(var) - for i in xrange(e1-s1+1): + for i in range(e1-s1+1): x = prefix+struct.pack('>L', base+i)[-vlen:] self.cmap.add_cid2unichr(s1+i, x) return diff --git a/pdfminer/converter.py b/pdfminer/converter.py index b01616e..ccf1d2a 100644 --- a/pdfminer/converter.py +++ b/pdfminer/converter.py @@ -99,7 +99,7 @@ class PDFLayoutAnalyzer(PDFTextDevice): # other shapes pts = [] for p in path: - for i in xrange(1, len(p), 2): + for i in range(1, len(p), 2): pts.append(apply_matrix_pt(self.ctm, (p[i], p[i+1]))) self.cur_item.add(LTCurve(gstate.linewidth, pts)) return @@ -254,7 +254,7 @@ class HTMLConverter(PDFConverter): def write_footer(self): self.write('
Page: %s
\n' % - ', '.join('%s' % (i, i) for i in xrange(1, self.pageno))) + ', '.join('%s' % (i, i) for i in range(1, self.pageno))) self.write('\n') return diff --git a/pdfminer/pdffont.py b/pdfminer/pdffont.py index 770bc1d..a4bca61 100644 --- a/pdfminer/pdffont.py +++ b/pdfminer/pdffont.py @@ -45,7 +45,7 @@ def get_widths(seq): r.append(v) if len(r) == 3: (char1, char2, w) = r - for i in xrange(char1, char2+1): + for i in range(char1, char2+1): widths[i] = w r = [] return widths @@ -68,7 +68,7 @@ def get_widths2(seq): r.append(v) if len(r) == 5: (char1, char2, w, vx, vy) = r - for i in xrange(char1, char2+1): + for i in range(char1, char2+1): widths[i] = (w, (vx, vy)) r = [] return widths @@ -266,7 +266,7 @@ class CFFFont(object): self.fp = fp self.offsets = [] (count, offsize) = struct.unpack('>HB', self.fp.read(3)) - for i in xrange(count+1): + for i in range(count+1): self.offsets.append(nunpack(self.fp.read(offsize))) self.base = self.fp.tell()-1 self.fp.seek(self.base+self.offsets[-1]) @@ -283,7 +283,7 @@ class CFFFont(object): return self.fp.read(self.offsets[i+1]-self.offsets[i]) def __iter__(self): - return iter(self[i] for i in xrange(len(self))) + return iter(self[i] for i in range(len(self))) def __init__(self, name, fp): self.name = name @@ -323,9 +323,9 @@ class CFFFont(object): # Format 1 (n,) = struct.unpack('B', self.fp.read(1)) code = 0 - for i in xrange(n): + for i in range(n): (first, nleft) = struct.unpack('BB', self.fp.read(2)) - for gid in xrange(first, first+nleft+1): + for gid in range(first, first+nleft+1): self.code2gid[code] = gid self.gid2code[gid] = code code += 1 @@ -348,9 +348,9 @@ class CFFFont(object): # Format 1 (n,) = struct.unpack('B', self.fp.read(1)) sid = 0 - for i in xrange(n): + for i in range(n): (first, nleft) = struct.unpack('BB', self.fp.read(2)) - for gid in xrange(first, first+nleft+1): + for gid in range(first, first+nleft+1): name = self.getstr(sid) self.name2gid[name] = gid self.gid2name[gid] = name @@ -384,7 +384,7 @@ class TrueTypeFont(object): self.tables = {} self.fonttype = fp.read(4) (ntables, _1, _2, _3) = struct.unpack('>HHHH', fp.read(8)) - for _ in xrange(ntables): + for _ in range(ntables): (name, tsum, offset, length) = struct.unpack('>4sLLL', fp.read(16)) self.tables[name] = (offset, length) return @@ -397,7 +397,7 @@ class TrueTypeFont(object): fp.seek(base_offset) (version, nsubtables) = struct.unpack('>HH', fp.read(4)) subtables = [] - for i in xrange(nsubtables): + for i in range(nsubtables): subtables.append(struct.unpack('>HHL', fp.read(8))) char2gid = {} # Only supports subtable type 0, 2 and 4. @@ -413,7 +413,7 @@ class TrueTypeFont(object): firstbytes[k//8] = i nhdrs = max(subheaderkeys)//8 + 1 hdrs = [] - for i in xrange(nhdrs): + for i in range(nhdrs): (firstcode, entcount, delta, offset) = struct.unpack('>HHhH', fp.read(8)) hdrs.append((i, firstcode, entcount, delta, fp.tell()-2+offset)) for (i, firstcode, entcount, delta, pos) in hdrs: @@ -421,7 +421,7 @@ class TrueTypeFont(object): continue first = firstcode + (firstbytes[i] << 8) fp.seek(pos) - for c in xrange(entcount): + for c in range(entcount): gid = struct.unpack('>H', fp.read(2)) if gid: gid += delta @@ -438,10 +438,10 @@ class TrueTypeFont(object): for (ec, sc, idd, idr) in zip(ecs, scs, idds, idrs): if idr: fp.seek(pos+idr) - for c in xrange(sc, ec+1): + for c in range(sc, ec+1): char2gid[c] = (struct.unpack('>H', fp.read(2))[0] + idd) & 0xffff else: - for c in xrange(sc, ec+1): + for c in range(sc, ec+1): char2gid[c] = (c + idd) & 0xffff else: assert 0