summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Mike Naberezny <mike@naberezny.com>2015-03-03 09:41:58 -0800
committer Mike Naberezny <mike@naberezny.com>2015-03-03 09:41:58 -0800
commit14e4e3079839bc9144d637cc625b8ec12e4a0af1 (patch)
tree8da1ce6b6996c8bcd40a86b7a0bcfeca21c7657c
parent2e206903f97a1ad1b88c47a441d3dbc2cc697e18 (diff)
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.
-rw-r--r--src/emu/cpu/arcompact/arcompact_make.py3
-rw-r--r--src/emu/cpu/h8/h8make.py8
-rwxr-xr-xsrc/emu/cpu/m6502/m6502make.py9
-rw-r--r--src/emu/cpu/m6809/m6809make.py5
-rw-r--r--src/emu/cpu/mcs96/mcs96make.py8
-rwxr-xr-xsrc/emu/cpu/tms57002/tmsmake.py3
6 files changed, 23 insertions, 13 deletions
diff --git a/src/emu/cpu/arcompact/arcompact_make.py b/src/emu/cpu/arcompact/arcompact_make.py
index b408e213286..67329eb7caf 100644
--- a/src/emu/cpu/arcompact/arcompact_make.py
+++ b/src/emu/cpu/arcompact/arcompact_make.py
@@ -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)
diff --git a/src/emu/cpu/h8/h8make.py b/src/emu/cpu/h8/h8make.py
index 7e72e78fdc1..3c9458d4de1 100644
--- a/src/emu/cpu/h8/h8make.py
+++ b/src/emu/cpu/h8/h8make.py
@@ -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)
diff --git a/src/emu/cpu/m6502/m6502make.py b/src/emu/cpu/m6502/m6502make.py
index 8061780364f..591d01268ca 100755
--- a/src/emu/cpu/m6502/m6502make.py
+++ b/src/emu/cpu/m6502/m6502make.py
@@ -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)
diff --git a/src/emu/cpu/m6809/m6809make.py b/src/emu/cpu/m6809/m6809make.py
index 04025fc3bbb..63f27084fa0 100644
--- a/src/emu/cpu/m6809/m6809make.py
+++ b/src/emu/cpu/m6809/m6809make.py
@@ -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())
diff --git a/src/emu/cpu/mcs96/mcs96make.py b/src/emu/cpu/mcs96/mcs96make.py
index 58140cb4b10..f0c7fd51fc8 100644
--- a/src/emu/cpu/mcs96/mcs96make.py
+++ b/src/emu/cpu/mcs96/mcs96make.py
@@ -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)
diff --git a/src/emu/cpu/tms57002/tmsmake.py b/src/emu/cpu/tms57002/tmsmake.py
index 488c405ba8a..e8aabce2972 100755
--- a/src/emu/cpu/tms57002/tmsmake.py
+++ b/src/emu/cpu/tms57002/tmsmake.py
@@ -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)