Fixed some issued

Aidan Macdonald · Aidan Macdonald · commit d5b61ad0531f · 2019-03-19T17:10:52.000-07:00
diff --git a/bin/j2py b/bin/j2py
@@ -9,9 +9,11 @@ a file, translate it, and write it out.
 import sys
 from argparse import ArgumentParser, ArgumentTypeError
 from collections import defaultdict
-from logging import _levelNames as logLevels, exception, warning, info, basicConfig
-from os import path, makedirs
+from os import path, makedirs, walk
+import logging
+from logging import basicConfig
 from time import time
+from io import IOBase
 
 from java2python.compiler import Module, buildAST, transformAST
 from java2python.config import Config
@@ -22,19 +24,7 @@ version = '0.5.1'
 
 
 def logLevel(value):
-    """ Returns a valid logging level or raises and exception. """
-    msg = 'invalid loglevel: %r'
-    try:
-        lvl = int(value)
-    except (ValueError, ):
-        name = value.upper()
-        if name not in logLevels:
-            raise ArgumentTypeError(msg % value)
-        lvl = logLevels[name]
-    else:
-        if lvl not in logLevels:
-            raise ArgumentTypeError(msg % value)
-    return lvl
+    return logging.getLevelName(value.upper())
 
 
 def configFromDir(inname, dirname):
@@ -60,24 +50,24 @@ def runOneOrMany(options):
     """ Runs our main transformer with each of the input files. """
     infile, outfile = options.inputfile, options.outputfile
 
-    if infile and not isinstance(infile, file) and path.isdir(infile):
-        if outfile and not isinstance(outfile, file) and not path.isdir(outfile):
+    if infile and not isinstance(infile, IOBase) and path.isdir(infile):
+        if outfile and not isinstance(outfile, IOBase) and not path.isdir(outfile):
             warning('Must specify output directory or stdout when using input directory.')
             return 2
         def walker(arg, dirname, files):
             for name in [name for name in files if name.endswith('.java')]:
                 fullname = path.join(dirname, name)
                 options.inputfile = fullname
                 info('opening %s', fullname)
-                if outfile and outfile != '-' and not isinstance(outfile, file):
+                if outfile and outfile != '-' and not isinstance(outfile, IOBase):
                     full = path.abspath(path.join(outfile, fullname))
                     head, tail = path.split(full)
                     tail = path.splitext(tail)[0] + '.py'
                     if not path.exists(head):
                         makedirs(head)
                     options.outputfile = path.join(head, tail)
                 runTransform(options)
-        path.walk(infile, walker, None)
+        walk(infile, walker, None)
         return 0
     else:
         return runTransform(options)
@@ -89,15 +79,15 @@ def runTransform(options):
     timed['overall']
 
     filein = fileout = filedefault = '-'
-    if options.inputfile and not isinstance(options.inputfile, file):
+    if options.inputfile and not isinstance(options.inputfile, IOBase):
         filein = options.inputfile
-    if options.outputfile and not isinstance(options.outputfile, file):
+    if options.outputfile and not isinstance(options.outputfile, IOBase):
         fileout = options.outputfile
     elif fileout != filedefault:
         fileout = '%s.py' % (path.splitext(filein)[0])
 
     configs = options.configs
-    if options.configdirs and not isinstance(filein, file):
+    if options.configdirs and not isinstance(filein, IOBase):
         for configdir in options.configdirs:
             dirname = configFromDir(filein, configdir)
             if path.exists(dirname):
@@ -110,15 +100,15 @@ def runTransform(options):
             source = open(filein).read()
         else:
             source = sys.stdin.read()
-    except (IOError, ), exc:
+    except (IOError, ) as exc:
         code, msg = exc.args[0:2]
-        print 'IOError: %s.' % (msg, )
+        print('IOError: %s.' % (msg, ))
         return code
 
     timed['comp']
     try:
         tree = buildAST(source)
-    except (Exception, ), exc:
+    except (Exception, ) as exc:
         exception('exception while parsing')
         return 1
     timed['comp_finish']
@@ -136,35 +126,35 @@ def runTransform(options):
     timed['visit_finish']
 
     timed['encode']
-    source = unicode(module)
+    source = str(module)
     timed['encode_finish']
     timed['overall_finish']
 
     if options.lexertokens:
         for idx, tok in enumerate(tree.parser.input.tokens):
-            print >> sys.stderr, '{0}  {1}'.format(idx, tok)
-        print >> sys.stderr
+            print('{0}  {1}'.format(idx, tok), file=sys.stderr)
+        print(file=sys.stderr)
 
     if options.javaast:
         tree.dump(sys.stderr)
-        print >> sys.stderr
+        print(file=sys.stderr)
 
     if options.pytree:
         module.dumpRepr(sys.stderr)
-        print >> sys.stderr
+        print(file=sys.stderr)
 
     if not options.skipsource:
         if fileout == filedefault:
             output = sys.stdout
         else:
             output = open(fileout, 'w')
         module.name = path.splitext(filein)[0] if filein != '-' else '<stdin>'
-        print >> output, source
+        print(source, file=output)
 
     if not options.skipcompile:
         try:
             compile(source, '<string>', 'exec')
-        except (SyntaxError, ), ex:
+        except (SyntaxError, ) as ex:
             warning('Generated source has invalid syntax. %s', ex)
         else:
             info('Generated source has valid syntax.')
diff --git a/java2python/lang/JavaLexer.py b/java2python/lang/JavaLexer.py
@@ -195,7 +195,7 @@
 class JavaLexer(Lexer):
 
     grammarFileName = "Java.g"
-    antlr_version = version_str_to_tuple("3.1.3 Mar 18, 2009 10:09:25")
+    antlr_version = ("3.1.3", "Mar 18, 2009", "10:09:25")
     antlr_version_str = "3.1.3 Mar 18, 2009 10:09:25"
 
     def __init__(self, input=None, state=None):
diff --git a/java2python/lang/JavaParser.py b/java2python/lang/JavaParser.py
@@ -239,7 +239,7 @@
 
 class JavaParser(Parser):
     grammarFileName = "Java.g"
-    antlr_version = version_str_to_tuple("3.1.3 Mar 18, 2009 10:09:25")
+    antlr_version = ("3.1.3", "Mar 18, 2009", "10:09:25")
     antlr_version_str = "3.1.3 Mar 18, 2009 10:09:25"
     tokenNames = tokenNames
 
