From 28e96ba3d0ccd1e0a62c4ca6743d0100ea50221e Mon Sep 17 00:00:00 2001 From: Yusuke Shinyama Date: Sun, 15 Jun 2014 12:14:33 +0900 Subject: [PATCH] Use print as a function. --- pdfminer/__init__.py | 2 +- pdfminer/ccitt.py | 2 +- pdfminer/pdffont.py | 2 +- pdfminer/psparser.py | 4 ++-- tools/conv_afm.py | 8 ++++---- tools/conv_cmap.py | 8 ++++---- tools/conv_glyphlist.py | 10 ++++------ tools/dumppdf.py | 2 +- tools/latin2ascii.py | 2 +- tools/prof.py | 2 +- tools/runapp.py | 4 ++-- 11 files changed, 22 insertions(+), 24 deletions(-) diff --git a/pdfminer/__init__.py b/pdfminer/__init__.py index 20fc6b0..a7bc049 100644 --- a/pdfminer/__init__.py +++ b/pdfminer/__init__.py @@ -2,4 +2,4 @@ __version__ = '20140328' if __name__ == '__main__': - print __version__ + print (__version__) diff --git a/pdfminer/ccitt.py b/pdfminer/ccitt.py index f8d269e..bb8181c 100644 --- a/pdfminer/ccitt.py +++ b/pdfminer/ccitt.py @@ -425,7 +425,7 @@ class CCITTG4Parser(BitParser): return def output_line(self, y, bits): - print y, ''.join(str(b) for b in bits) + print (y, ''.join(str(b) for b in bits)) return def _reset_line(self): diff --git a/pdfminer/pdffont.py b/pdfminer/pdffont.py index 95739aa..01fb21b 100644 --- a/pdfminer/pdffont.py +++ b/pdfminer/pdffont.py @@ -718,7 +718,7 @@ def main(argv): fp = file(fname, 'rb') #font = TrueTypeFont(fname, fp) font = CFFFont(fname, fp) - print font + print (font) fp.close() return diff --git a/pdfminer/psparser.py b/pdfminer/psparser.py index 2810cfa..a07b209 100644 --- a/pdfminer/psparser.py +++ b/pdfminer/psparser.py @@ -695,13 +695,13 @@ func/a/b{(c)do*}def def test_1(self): tokens = self.get_tokens(self.TESTDATA) - print tokens + print (tokens) self.assertEqual(tokens, self.TOKENS) return def test_2(self): objs = self.get_objects(self.TESTDATA) - print objs + print (objs) self.assertEqual(objs, self.OBJS) return diff --git a/tools/conv_afm.py b/tools/conv_afm.py index 647403e..846e255 100755 --- a/tools/conv_afm.py +++ b/tools/conv_afm.py @@ -30,11 +30,11 @@ def main(argv): props['Flags'] = 64 elif k == 'FontBBox': props[k] = tuple(map(float, f[1:5])) - print '# -*- python -*-' - print 'FONT_METRICS = {' + print ('# -*- python -*-') + print ('FONT_METRICS = {') for (fontname,(props,chars)) in fonts.iteritems(): - print ' %r: %r,' % (fontname, (props,chars)) - print '}' + print (' %r: %r,' % (fontname, (props,chars))) + print ('}') return 0 if __name__ == '__main__': sys.exit(main(sys.argv)) diff --git a/tools/conv_cmap.py b/tools/conv_cmap.py index 4e908bd..75a9a76 100755 --- a/tools/conv_cmap.py +++ b/tools/conv_cmap.py @@ -153,7 +153,7 @@ def main(argv): import os.path def usage(): - print 'usage: %s [-c enc=codec] output_dir regname [cid2code.txt ...]' % argv[0] + print ('usage: %s [-c enc=codec] output_dir regname [cid2code.txt ...]' % argv[0]) return 100 try: (opts, args) = getopt.getopt(argv[1:], 'c:') @@ -171,7 +171,7 @@ def main(argv): converter = CMapConverter(enc2codec) for path in args: - print >>sys.stderr, 'reading: %r...' % path + print ('reading: %r...' % path) fp = file(path) converter.load(fp) fp.close() @@ -179,14 +179,14 @@ def main(argv): for enc in converter.get_encs(): fname = '%s.pickle.gz' % enc path = os.path.join(outdir, fname) - print >>sys.stderr, 'writing: %r...' % path + print ('writing: %r...' % path) fp = gzip.open(path, 'wb') converter.dump_cmap(fp, enc) fp.close() fname = 'to-unicode-%s.pickle.gz' % regname path = os.path.join(outdir, fname) - print >>sys.stderr, 'writing: %r...' % path + print ('writing: %r...' % path) fp = gzip.open(path, 'wb') converter.dump_unicodemap(fp) fp.close() diff --git a/tools/conv_glyphlist.py b/tools/conv_glyphlist.py index 678550b..93179ad 100755 --- a/tools/conv_glyphlist.py +++ b/tools/conv_glyphlist.py @@ -9,16 +9,14 @@ def main(argv): if not line or line.startswith('#'): if state == 1: state = 2 - print '}' - print - print line + print ('}\n') + print (line) continue if state == 0: - print - print 'glyphname2unicode = {' + print ('\nglyphname2unicode = {') state = 1 (name,x) = line.split(';') codes = x.split(' ') - print ' %r: u\'%s\',' % (name, ''.join( '\\u%s' % code for code in codes )) + print (' %r: u\'%s\',' % (name, ''.join( '\\u%s' % code for code in codes ))) if __name__ == '__main__': sys.exit(main(sys.argv)) diff --git a/tools/dumppdf.py b/tools/dumppdf.py index bb665df..a81502c 100755 --- a/tools/dumppdf.py +++ b/tools/dumppdf.py @@ -226,7 +226,7 @@ def dumppdf(outfp, fname, objids, pagenos, password='', def main(argv): import getopt def usage(): - print 'usage: %s [-d] [-a] [-p pageid] [-P password] [-r|-b|-t] [-T] [-E directory] [-i objid] file ...' % argv[0] + print ('usage: %s [-d] [-a] [-p pageid] [-P password] [-r|-b|-t] [-T] [-E directory] [-i objid] file ...' % argv[0]) return 100 try: (opts, args) = getopt.getopt(argv[1:], 'dap:P:rbtTE:i:') diff --git a/tools/latin2ascii.py b/tools/latin2ascii.py index ab6c708..aa89e1d 100755 --- a/tools/latin2ascii.py +++ b/tools/latin2ascii.py @@ -112,7 +112,7 @@ def latin2ascii(s): def main(argv): import getopt, fileinput def usage(): - print 'usage: %s [-c codec] file ...' % argv[0] + print ('usage: %s [-c codec] file ...' % argv[0]) return 100 try: (opts, args) = getopt.getopt(argv[1:], 'c') diff --git a/tools/prof.py b/tools/prof.py index 31c3042..5402de4 100644 --- a/tools/prof.py +++ b/tools/prof.py @@ -4,7 +4,7 @@ import sys def prof_main(argv): import hotshot, hotshot.stats def usage(): - print 'usage: %s module.function [args ...]' % argv[0] + print ('usage: %s module.function [args ...]' % argv[0]) return 100 args = argv[1:] if len(args) < 1: return usage() diff --git a/tools/runapp.py b/tools/runapp.py index bd71b8e..6bdff8b 100755 --- a/tools/runapp.py +++ b/tools/runapp.py @@ -88,7 +88,7 @@ class WebAppHandler(SimpleHTTPRequestHandler): def main(argv): import getopt, imp def usage(): - print 'usage: %s [-h host] [-p port] [-n name] module.class' % argv[0] + print ('usage: %s [-h host] [-p port] [-n name] module.class' % argv[0]) return 100 try: (opts, args) = getopt.getopt(argv[1:], 'h:p:n:') @@ -105,7 +105,7 @@ def main(argv): path = args.pop(0) module = imp.load_source('app', path) WebAppHandler.APP_CLASS = getattr(module, name) - print 'Listening %s:%d...' % (host,port) + print ('Listening %s:%d...' % (host,port)) httpd = HTTPServer((host,port), WebAppHandler) httpd.serve_forever() return