Merge pull request #274 from igormp/iteritems
Replaced .iteritems() with six.iteritems() for Python 2 and 3 compatpull/273/head
commit
17364aa88e
|
@ -83,7 +83,7 @@ class CMap(CMapBase):
|
||||||
assert isinstance(cmap, CMap), str(type(cmap))
|
assert isinstance(cmap, CMap), str(type(cmap))
|
||||||
|
|
||||||
def copy(dst, src):
|
def copy(dst, src):
|
||||||
for (k, v) in src.iteritems():
|
for (k, v) in six.iteritems(src):
|
||||||
if isinstance(v, dict):
|
if isinstance(v, dict):
|
||||||
d = {}
|
d = {}
|
||||||
dst[k] = d
|
dst[k] = d
|
||||||
|
@ -110,7 +110,7 @@ class CMap(CMapBase):
|
||||||
if code2cid is None:
|
if code2cid is None:
|
||||||
code2cid = self.code2cid
|
code2cid = self.code2cid
|
||||||
code = ()
|
code = ()
|
||||||
for (k, v) in sorted(code2cid.iteritems()):
|
for (k, v) in sorted(six.iteritems(code2cid)):
|
||||||
c = code+(k,)
|
c = code+(k,)
|
||||||
if isinstance(v, int):
|
if isinstance(v, int):
|
||||||
out.write('code %r = cid %d\n' % (c, v))
|
out.write('code %r = cid %d\n' % (c, v))
|
||||||
|
@ -148,7 +148,7 @@ class UnicodeMap(CMapBase):
|
||||||
return self.cid2unichr[cid]
|
return self.cid2unichr[cid]
|
||||||
|
|
||||||
def dump(self, out=sys.stdout):
|
def dump(self, out=sys.stdout):
|
||||||
for (k, v) in sorted(self.cid2unichr.iteritems()):
|
for (k, v) in sorted(six.iteritems(self.cid2unichr)):
|
||||||
out.write('cid %d = unicode %r\n' % (k, v))
|
out.write('cid %d = unicode %r\n' % (k, v))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -178,7 +178,7 @@ class TagExtractor(PDFDevice):
|
||||||
s = ''
|
s = ''
|
||||||
if isinstance(props, dict):
|
if isinstance(props, dict):
|
||||||
s = ''.join(' %s="%s"' % (utils.enc(k), utils.enc(str(v))) for (k, v)
|
s = ''.join(' %s="%s"' % (utils.enc(k), utils.enc(str(v))) for (k, v)
|
||||||
in sorted(props.iteritems()))
|
in sorted(six.iteritems(props)))
|
||||||
out_s = '<%s%s>' % (utils.enc(tag.name), s)
|
out_s = '<%s%s>' % (utils.enc(tag.name), s)
|
||||||
self.outfp.write(utils.make_compat_bytes(out_s))
|
self.outfp.write(utils.make_compat_bytes(out_s))
|
||||||
self._stack.append(tag)
|
self._stack.append(tag)
|
||||||
|
|
|
@ -453,7 +453,7 @@ class TrueTypeFont(object):
|
||||||
assert False, str(('Unhandled', fmttype))
|
assert False, str(('Unhandled', fmttype))
|
||||||
# create unicode map
|
# create unicode map
|
||||||
unicode_map = FileUnicodeMap()
|
unicode_map = FileUnicodeMap()
|
||||||
for (char, gid) in char2gid.iteritems():
|
for (char, gid) in six.iteritems(char2gid):
|
||||||
unicode_map.add_cid2unichr(gid, char)
|
unicode_map.add_cid2unichr(gid, char)
|
||||||
return unicode_map
|
return unicode_map
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@ def resolve_all(x, default=None):
|
||||||
if isinstance(x, list):
|
if isinstance(x, list):
|
||||||
x = [resolve_all(v, default=default) for v in x]
|
x = [resolve_all(v, default=default) for v in x]
|
||||||
elif isinstance(x, dict):
|
elif isinstance(x, dict):
|
||||||
for (k, v) in x.iteritems():
|
for (k, v) in six.iteritems(x):
|
||||||
x[k] = resolve_all(v, default=default)
|
x[k] = resolve_all(v, default=default)
|
||||||
return x
|
return x
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
import sys
|
import sys
|
||||||
import fileinput
|
import fileinput
|
||||||
|
|
||||||
|
import six #Python 2+3 compatibility
|
||||||
|
|
||||||
def main(argv):
|
def main(argv):
|
||||||
fonts = {}
|
fonts = {}
|
||||||
for line in fileinput.input():
|
for line in fileinput.input():
|
||||||
|
@ -33,7 +35,7 @@ def main(argv):
|
||||||
props[k] = tuple(map(float, f[1:5]))
|
props[k] = tuple(map(float, f[1:5]))
|
||||||
print ('# -*- python -*-')
|
print ('# -*- python -*-')
|
||||||
print ('FONT_METRICS = {')
|
print ('FONT_METRICS = {')
|
||||||
for (fontname,(props,chars)) in fonts.iteritems():
|
for (fontname,(props,chars)) in six.iteritems(fonts):
|
||||||
print (' %r: %r,' % (fontname, (props,chars)))
|
print (' %r: %r,' % (fontname, (props,chars)))
|
||||||
print ('}')
|
print ('}')
|
||||||
return 0
|
return 0
|
||||||
|
|
|
@ -26,6 +26,7 @@ from pdfminer.pdfinterp import PDFResourceManager, PDFPageInterpreter
|
||||||
from pdfminer.converter import HTMLConverter, TextConverter
|
from pdfminer.converter import HTMLConverter, TextConverter
|
||||||
from pdfminer.layout import LAParams
|
from pdfminer.layout import LAParams
|
||||||
|
|
||||||
|
import six #Python 2+3 compatibility
|
||||||
|
|
||||||
# quote HTML metacharacters
|
# quote HTML metacharacters
|
||||||
def q(x):
|
def q(x):
|
||||||
|
@ -35,7 +36,7 @@ def q(x):
|
||||||
Q = re.compile(r'[^a-zA-Z0-9_.-=]')
|
Q = re.compile(r'[^a-zA-Z0-9_.-=]')
|
||||||
def url(base, **kw):
|
def url(base, **kw):
|
||||||
r = []
|
r = []
|
||||||
for (k,v) in kw.iteritems():
|
for (k,v) in six.iteritems(kw):
|
||||||
v = Q.sub(lambda m: '%%%02X' % ord(m.group(0)), encoder(q(v), 'replace')[0])
|
v = Q.sub(lambda m: '%%%02X' % ord(m.group(0)), encoder(q(v), 'replace')[0])
|
||||||
r.append('%s=%s' % (k, v))
|
r.append('%s=%s' % (k, v))
|
||||||
return base+'&'.join(r)
|
return base+'&'.join(r)
|
||||||
|
|
Loading…
Reference in New Issue