Use print as a function.

pull/1/head
Yusuke Shinyama 2014-06-15 12:14:33 +09:00
parent 0387a6c260
commit 28e96ba3d0
11 changed files with 22 additions and 24 deletions

View File

@ -2,4 +2,4 @@
__version__ = '20140328' __version__ = '20140328'
if __name__ == '__main__': if __name__ == '__main__':
print __version__ print (__version__)

View File

@ -425,7 +425,7 @@ class CCITTG4Parser(BitParser):
return return
def output_line(self, y, bits): 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 return
def _reset_line(self): def _reset_line(self):

View File

@ -718,7 +718,7 @@ def main(argv):
fp = file(fname, 'rb') fp = file(fname, 'rb')
#font = TrueTypeFont(fname, fp) #font = TrueTypeFont(fname, fp)
font = CFFFont(fname, fp) font = CFFFont(fname, fp)
print font print (font)
fp.close() fp.close()
return return

View File

@ -695,13 +695,13 @@ func/a/b{(c)do*}def
def test_1(self): def test_1(self):
tokens = self.get_tokens(self.TESTDATA) tokens = self.get_tokens(self.TESTDATA)
print tokens print (tokens)
self.assertEqual(tokens, self.TOKENS) self.assertEqual(tokens, self.TOKENS)
return return
def test_2(self): def test_2(self):
objs = self.get_objects(self.TESTDATA) objs = self.get_objects(self.TESTDATA)
print objs print (objs)
self.assertEqual(objs, self.OBJS) self.assertEqual(objs, self.OBJS)
return return

View File

@ -30,11 +30,11 @@ def main(argv):
props['Flags'] = 64 props['Flags'] = 64
elif k == 'FontBBox': elif k == 'FontBBox':
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 fonts.iteritems():
print ' %r: %r,' % (fontname, (props,chars)) print (' %r: %r,' % (fontname, (props,chars)))
print '}' print ('}')
return 0 return 0
if __name__ == '__main__': sys.exit(main(sys.argv)) if __name__ == '__main__': sys.exit(main(sys.argv))

View File

@ -153,7 +153,7 @@ def main(argv):
import os.path import os.path
def usage(): 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 return 100
try: try:
(opts, args) = getopt.getopt(argv[1:], 'c:') (opts, args) = getopt.getopt(argv[1:], 'c:')
@ -171,7 +171,7 @@ def main(argv):
converter = CMapConverter(enc2codec) converter = CMapConverter(enc2codec)
for path in args: for path in args:
print >>sys.stderr, 'reading: %r...' % path print ('reading: %r...' % path)
fp = file(path) fp = file(path)
converter.load(fp) converter.load(fp)
fp.close() fp.close()
@ -179,14 +179,14 @@ def main(argv):
for enc in converter.get_encs(): for enc in converter.get_encs():
fname = '%s.pickle.gz' % enc fname = '%s.pickle.gz' % enc
path = os.path.join(outdir, fname) path = os.path.join(outdir, fname)
print >>sys.stderr, 'writing: %r...' % path print ('writing: %r...' % path)
fp = gzip.open(path, 'wb') fp = gzip.open(path, 'wb')
converter.dump_cmap(fp, enc) converter.dump_cmap(fp, enc)
fp.close() fp.close()
fname = 'to-unicode-%s.pickle.gz' % regname fname = 'to-unicode-%s.pickle.gz' % regname
path = os.path.join(outdir, fname) path = os.path.join(outdir, fname)
print >>sys.stderr, 'writing: %r...' % path print ('writing: %r...' % path)
fp = gzip.open(path, 'wb') fp = gzip.open(path, 'wb')
converter.dump_unicodemap(fp) converter.dump_unicodemap(fp)
fp.close() fp.close()

View File

@ -9,16 +9,14 @@ def main(argv):
if not line or line.startswith('#'): if not line or line.startswith('#'):
if state == 1: if state == 1:
state = 2 state = 2
print '}' print ('}\n')
print print (line)
print line
continue continue
if state == 0: if state == 0:
print print ('\nglyphname2unicode = {')
print 'glyphname2unicode = {'
state = 1 state = 1
(name,x) = line.split(';') (name,x) = line.split(';')
codes = x.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)) if __name__ == '__main__': sys.exit(main(sys.argv))

View File

@ -226,7 +226,7 @@ def dumppdf(outfp, fname, objids, pagenos, password='',
def main(argv): def main(argv):
import getopt import getopt
def usage(): 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 return 100
try: try:
(opts, args) = getopt.getopt(argv[1:], 'dap:P:rbtTE:i:') (opts, args) = getopt.getopt(argv[1:], 'dap:P:rbtTE:i:')

View File

@ -112,7 +112,7 @@ def latin2ascii(s):
def main(argv): def main(argv):
import getopt, fileinput import getopt, fileinput
def usage(): def usage():
print 'usage: %s [-c codec] file ...' % argv[0] print ('usage: %s [-c codec] file ...' % argv[0])
return 100 return 100
try: try:
(opts, args) = getopt.getopt(argv[1:], 'c') (opts, args) = getopt.getopt(argv[1:], 'c')

View File

@ -4,7 +4,7 @@ import sys
def prof_main(argv): def prof_main(argv):
import hotshot, hotshot.stats import hotshot, hotshot.stats
def usage(): def usage():
print 'usage: %s module.function [args ...]' % argv[0] print ('usage: %s module.function [args ...]' % argv[0])
return 100 return 100
args = argv[1:] args = argv[1:]
if len(args) < 1: return usage() if len(args) < 1: return usage()

View File

@ -88,7 +88,7 @@ class WebAppHandler(SimpleHTTPRequestHandler):
def main(argv): def main(argv):
import getopt, imp import getopt, imp
def usage(): 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 return 100
try: try:
(opts, args) = getopt.getopt(argv[1:], 'h:p:n:') (opts, args) = getopt.getopt(argv[1:], 'h:p:n:')
@ -105,7 +105,7 @@ def main(argv):
path = args.pop(0) path = args.pop(0)
module = imp.load_source('app', path) module = imp.load_source('app', path)
WebAppHandler.APP_CLASS = getattr(module, name) WebAppHandler.APP_CLASS = getattr(module, name)
print 'Listening %s:%d...' % (host,port) print ('Listening %s:%d...' % (host,port))
httpd = HTTPServer((host,port), WebAppHandler) httpd = HTTPServer((host,port), WebAppHandler)
httpd.serve_forever() httpd.serve_forever()
return return