Previous

199869 Revisions

Next

r36222 Tuesday 3rd March, 2015 at 17:41:58 UTC by Mike Naberezny
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.

[src/emu/cpu/arcompact]	arcompact_make.py
[src/emu/cpu/h8]	h8make.py
[src/emu/cpu/m6502]	m6502make.py
[src/emu/cpu/m6809]	m6809make.py
[src/emu/cpu/mcs96]	mcs96make.py
[src/emu/cpu/tms57002]	tmsmake.py

trunk/src/emu/cpu/arcompact/arcompact_make.py

r244733	r244734
351	351
352	352	try:
353	353	f = open(sys.argv[1], "w")
354		except Exception, err:
	354	except Exception:
	355	err = sys.exc_info()[1]
355	356	sys.stderr.write("cannot write file %s [%s]\n" % (sys.argv[1], err))
356	357	sys.exit(1)
357	358

trunk/src/emu/cpu/h8/h8make.py

r244733	r244734
261	261	self.macros = {}
262	262	try:
263	263	f = open(fname, "r")
264		except Exception, err:
265		print "Cannot read opcodes file %s [%s]" % (fname, err)
	264	except Exception:
	265	err = sys.exc_info()[1]
	266	sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
266	267	sys.exit(1)
267	268
268	269	opc = None
r244733	r244734
450	451
451	452	try:
452	453	f = open(argv[3], "w")
453		except Exception, err:
	454	except Exception:
	455	err = sys.exc_info()[1]
454	456	sys.stderr.write("cannot write file %s [%s]\n" % (argv[3], err))
455	457	sys.exit(1)
456	458

trunk/src/emu/cpu/m6502/m6502make.py

r244733	r244734
15	15	logging.info("load_opcodes: %s", fname)
16	16	try:
17	17	f = open(fname, "rU")
18		except Exception, err:
	18	except Exception:
	19	err = sys.exc_info()[1]
19	20	logging.error("cannot read opcodes file %s [%s]", fname, err)
20	21	sys.exit(1)
21	22
r244733	r244734
37	38	states = []
38	39	try:
39	40	f = open(fname, "rU")
40		except Exception, err:
	41	except Exception:
	42	err = sys.exc_info()[1]
41	43	logging.error("cannot read display file %s [%s]", fname, err)
42	44	sys.exit(1)
43	45	for line in f:
r244733	r244734
226	228	logging.info("saving: %s", fname)
227	229	try:
228	230	f = open(fname, "w")
229		except Exception, err:
	231	except Exception:
	232	err = sys.exc_info()[1]
230	233	logging.error("cannot write file %s [%s]", fname, err)
231	234	sys.exit(1)
232	235	save_opcodes(f,device, opcodes)

trunk/src/emu/cpu/m6809/m6809make.py

r244733	r244734
15	15	path = path + '/'
16	16	try:
17	17	f = open(fname, "rU")
18		except Exception, err:
19		print "Cannot read opcodes file %s [%s]" % (fname, err)
	18	except Exception:
	19	err = sys.exc_info()[1]
	20	sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
20	21	sys.exit(1)
21	22
22	23	rawlines = re.split('(\n|; *\n?)', f.read())

trunk/src/emu/cpu/mcs96/mcs96make.py

r244733	r244734
70	70	self.macros = {}
71	71	try:
72	72	f = open(fname, "rU")
73		except Exception, err:
74		print "Cannot read opcodes file %s [%s]" % (fname, err)
	73	except Exception:
	74	err = sys.exc_info()[1]
	75	sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err))
75	76	sys.exit(1)
76	77
77	78	opc = None
r244733	r244734
174	175
175	176	try:
176	177	f = open(argv[3], "w")
177		except Exception, err:
	178	except Exception:
	179	err = sys.exc_info()[1]
178	180	sys.stderr.write("cannot write file %s [%s]\n" % (argv[3], err))
179	181	sys.exit(1)
180	182

trunk/src/emu/cpu/tms57002/tmsmake.py

r244733	r244734
416	416	ins_list = LoadLst(sys.argv[1])
417	417	try:
418	418	f = open(sys.argv[2], "w")
419		except Exception, err:
	419	except Exception:
	420	err = sys.exc_info()[1]
420	421	sys.stderr.write("cannot write file %s [%s]\n" % (sys.argv[2], err))
421	422	sys.exit(1)
422	423

https://github.com/mamedev/mame/commit/14e4e3079839bc9144d637cc625b8ec12e4a0af1

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team