Upgrade to Python3 and antlr-python3-runtime >= 3.4 (tested with 3.5.3)

Author: OliverKohl

Diff for: bin/j2py

@@ -6,10 +6,11 @@ This is all very ordinary.  We import the package bits, open and read
 a file, translate it, and write it out.
 
 """
+import os.path
 import sys
 from argparse import ArgumentParser, ArgumentTypeError
 from collections import defaultdict
-from logging import _levelNames as logLevels, exception, warning, info, basicConfig
+from logging import _nameToLevel as logLevels, exception, warning, info, basicConfig
 from os import path, makedirs
 from time import time
 
@@ -60,8 +61,8 @@ 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 os.path.isfile(infile) and path.isdir(infile):
+        if outfile and not os.path.isfile(outfile) and not path.isdir(outfile):
             warning('Must specify output directory or stdout when using input directory.')
             return 2
         def walker(arg, dirname, files):
@@ -89,9 +90,9 @@ def runTransform(options):
     timed['overall']
 
     filein = fileout = filedefault = '-'
-    if options.inputfile and not isinstance(options.inputfile, file):
+    if options.inputfile and not os.path.isfile(options.inputfile):
         filein = options.inputfile
-    if options.outputfile and not isinstance(options.outputfile, file):
+    if options.outputfile and not os.path.isfile(options.outputfile):
         fileout = options.outputfile
     elif fileout != filedefault:
         fileout = '%s.py' % (path.splitext(filein)[0])
@@ -110,15 +111,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']
@@ -164,7 +165,7 @@ def runTransform(options):
     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.')
@@ -256,4 +257,4 @@ def configScript(argv):
 
 
 if __name__ == '__main__':
-    sys.exit(runMain(configScript(sys.argv[1:])))
+    sys.exit(runMain(configScript(sys.argv[1:])))

Diff for: java2python/compiler/block.py

@@ -16,7 +16,7 @@
 from java2python.compiler import template, visitor
 
 
-def addTypeToModule((className, factoryName)):
+def addTypeToModule(className, factoryName):
     """ Constructs and adds a new type to this module. """
     bases = (getattr(template, className), getattr(visitor, className))
     newType = type(className, bases, dict(factoryName=factoryName))

Diff for: java2python/compiler/template.py

@@ -13,9 +13,9 @@
 # are usually a sign of a bad design and/or language limitations, and
 # this case is no exception.
 
-from cStringIO import StringIO
+from io import StringIO
 from functools import partial
-from itertools import chain, ifilter, imap
+from itertools import chain
 
 from java2python.lang import tokens
 from java2python.lib import FS, colors
@@ -173,20 +173,20 @@ def configHandler(self, part, suffix='Handler', default=None):
     def configHandlers(self, part, suffix='Handlers'):
         """ Returns config handlers for this type of template """
         name = '{0}{1}{2}'.format(self.typeName, part, suffix)
-        return imap(self.toIter, chain(*self.config.every(name, [])))
+        return map(self.toIter, chain(*self.config.every(name, [])))
 
     def dump(self, fd, level=0):
         """ Writes the Python source code for this template to the given file. """
         indent, isNotNone = level * self.indent, lambda x:x is not None
         lineFormat = '{0}{1}\n'.format
-        for line in ifilter(isNotNone, self.iterPrologue()):
+        for line in filter(isNotNone, self.iterPrologue()):
             line = lineFormat(indent, line)
             fd.write(line if line.strip() else '\n')
-        for item in ifilter(isNotNone, self.iterHead()):
+        for item in filter(isNotNone, self.iterHead()):
             item.dump(fd, level+1)
         for item in self.iterBody():
             item.dump(fd, level+1)
-        for line in ifilter(isNotNone, self.iterEpilogue()):
+        for line in filter(isNotNone, self.iterEpilogue()):
             line = lineFormat(indent, line)
             fd.write(line if line.strip() else '\n')
 
@@ -200,7 +200,7 @@ def dumpRepr(self, fd, level=0):
         """ Writes a debug string for this template to the given file. """
         indent, default = self.indent, lambda x, y:None
         fd.write('{0}{1!r}\n'.format(indent*level, self))
-        for child in ifilter(None, self.children):
+        for child in filter(None, self.children):
             getattr(child, 'dumpRepr', default)(fd, level+1)
 
     @property
@@ -230,7 +230,7 @@ def iterPrologue(self):
     def iterHead(self):
         """ Yields the items in the head of this template. """
         items = chain(*(h(self) for h in self.configHandlers('Head')))
-        return imap(self.toExpr, items)
+        return map(self.toExpr, items)
 
     def iterBody(self):
         """ Yields the items in the body of this template. """

Diff for: java2python/compiler/visitor.py

@@ -13,7 +13,7 @@
 
 
 from functools import reduce, partial
-from itertools import ifilter, ifilterfalse, izip, tee
+from itertools import filterfalse, tee
 from logging import debug, warn
 from re import compile as recompile, sub as resub
 
@@ -48,7 +48,7 @@ def insertComments(self, tmpl, tree, index, memo):
         cache, parser, comTypes = memo.comments, tree.parser, tokens.commentTypes
         comNew = lambda t:t.type in comTypes and (t.index not in cache)
 
-        for tok in ifilter(comNew, parser.input.tokens[memo.last:index]):
+        for tok in filter(comNew, parser.input.tokens[memo.last:index]):
             cache.add(tok.index)
 
             # loop over parents until we find the top expression
@@ -70,7 +70,7 @@ def insertComments(self, tmpl, tree, index, memo):
     def stripComment(self, text):
         """ Regex substitutions for comments; removes comment characters. """
         subText = lambda value, regex:resub(regex, '', value)
-        for text in ifilter(unicode.strip, text.split('\n')):
+        for text in filter(unicode.strip, text.split('\n')):
             yield reduce(subText, self.commentSubs, text)
 
     def walk(self, tree, memo=None):
@@ -95,7 +95,7 @@ def walk(self, tree, memo=None):
 
     def zipWalk(self, nodes, visitors, memo):
         """ Walk the given nodes zipped with the given visitors. """
-        for node, visitor in izip(nodes, visitors):
+        for node, visitor in zip(nodes, visitors):
             visitor.walk(node, memo)
 
     def nodeTypeToString(self, node):
@@ -161,9 +161,9 @@ class ModifiersAcceptor(object):
     def acceptModifierList(self, node, memo):
         """ Accept and process class and method modifiers. """
         isAnno = lambda token:token.type==tokens.AT
-        for ano in ifilter(isAnno, node.children):
+        for ano in filter(isAnno, node.children):
             self.nodesToAnnos(ano, memo)
-        for mod in ifilterfalse(isAnno, node.children):
+        for mod in filterfalse(isAnno, node.children):
             self.nodesToModifiers(mod, node)
         return self
 

Diff for: java2python/lang/JavaLexer.py

@@ -2,7 +2,8 @@
 
 import sys
 from antlr3 import *
-from antlr3.compat import set, frozenset
+
+from java2python.lang.compat import version_str_to_tuple
 
 
 # for convenience in actions