Replaced Python 2 isinstance(x, file) with isinstance(x, io.IOBase). Updated except to use as keywords.

changeling · changeling · commit b9c944a48591 · 2020-07-16T13:53:26.000-05:00
Replaced Python 2 `isinstance(x, file)` with Python 3 `isinstance(x, io.IOBase)`.  Fixed.
Python 3 no longer allows `file` in isinstance(), updated to use `io.IOBase`. Fixed.
Python 3 requires `as` keyword in `except`, in place of comma separator. Fixed.
`_levelNames` has been replaced with `_nameToLevel` in `logging`. Fixed.
Changed `print 'IOError: %s.' % (msg, )` to `print(f'IOError: {msg}.')`
diff --git a/bin/j2py b/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 io
 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,16 +61,16 @@ 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, io.IOBase) and path.isdir(infile):
+        if outfile and not isinstance(outfile, io.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, io.IOBase):
                     full = path.abspath(path.join(outfile, fullname))
                     head, tail = path.split(full)
                     tail = path.splitext(tail)[0] + '.py'
@@ -89,15 +90,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, io.IOBase):
         filein = options.inputfile
-    if options.outputfile and not isinstance(options.outputfile, file):
+    if options.outputfile and not isinstance(options.outputfile, io.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, io.IOBase):
         for configdir in options.configdirs:
             dirname = configFromDir(filein, configdir)
             if path.exists(dirname):
@@ -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(f'IOError: {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.')
