Remove except clause syntax not supported on Python 3. (nw)

This change uses sys.exc_info()[1] instead of the "as" syntax
to retain Python 2.5 compatibility.
This commit is contained in:
Mike Naberezny 2015-03-03 09:41:58 -08:00
parent 2e206903f9
commit 14e4e30798
6 changed files with 23 additions and 13 deletions

View File

@ -351,7 +351,8 @@ def EmitGroup17(f,funcname, opname, opexecute):
try:
f = open(sys.argv[1], "w")
except Exception, err:
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("cannot write file %s [%s]\n" % (sys.argv[1], err))
sys.exit(1)

View File

@ -261,8 +261,9 @@ class OpcodeList:
self.macros = {}
try:
f = open(fname, "r")
except Exception, err:
print "Cannot read opcodes file %s [%s]" % (fname, err)
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
sys.exit(1)
opc = None
@ -450,7 +451,8 @@ def main(argv):
try:
f = open(argv[3], "w")
except Exception, err:
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("cannot write file %s [%s]\n" % (argv[3], err))
sys.exit(1)

View File

@ -15,7 +15,8 @@ def load_opcodes(fname):
logging.info("load_opcodes: %s", fname)
try:
f = open(fname, "rU")
except Exception, err:
except Exception:
err = sys.exc_info()[1]
logging.error("cannot read opcodes file %s [%s]", fname, err)
sys.exit(1)
@ -37,7 +38,8 @@ def load_disp(fname):
states = []
try:
f = open(fname, "rU")
except Exception, err:
except Exception:
err = sys.exc_info()[1]
logging.error("cannot read display file %s [%s]", fname, err)
sys.exit(1)
for line in f:
@ -226,7 +228,8 @@ def save(fname, device, opcodes, states):
logging.info("saving: %s", fname)
try:
f = open(fname, "w")
except Exception, err:
except Exception:
err = sys.exc_info()[1]
logging.error("cannot write file %s [%s]", fname, err)
sys.exit(1)
save_opcodes(f,device, opcodes)

View File

@ -15,8 +15,9 @@ def load_file(fname, lines):
path = path + '/'
try:
f = open(fname, "rU")
except Exception, err:
print "Cannot read opcodes file %s [%s]" % (fname, err)
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
sys.exit(1)
rawlines = re.split('(\n|; *\n?)', f.read())

View File

@ -70,8 +70,9 @@ class OpcodeList:
self.macros = {}
try:
f = open(fname, "rU")
except Exception, err:
print "Cannot read opcodes file %s [%s]" % (fname, err)
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
sys.exit(1)
opc = None
@ -174,7 +175,8 @@ def main(argv):
try:
f = open(argv[3], "w")
except Exception, err:
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("cannot write file %s [%s]\n" % (argv[3], err))
sys.exit(1)

View File

@ -416,7 +416,8 @@ def EmitCintrp(f, ins_list):
ins_list = LoadLst(sys.argv[1])
try:
f = open(sys.argv[2], "w")
except Exception, err:
except Exception:
err = sys.exc_info()[1]
sys.stderr.write("cannot write file %s [%s]\n" % (sys.argv[2], err))
sys.exit(1)