python: Switch to using open instead of file
Python 3 doesn't support the file(name, mode) syntax which has been deprecated in favour of open. Change-Id: I35ef8690d97a5243860a64ff985fd22fa86253f1 Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/15985 Reviewed-by: Gabe Black <gabeblack@google.com> Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
This commit is contained in:
@@ -67,7 +67,7 @@ class CodeImporter(object):
|
||||
|
||||
override = os.environ.get('M5_OVERRIDE_PY_SOURCE', 'false').lower()
|
||||
if override in ('true', 'yes') and os.path.exists(abspath):
|
||||
src = file(abspath, 'r').read()
|
||||
src = open(abspath, 'r').read()
|
||||
code = compile(src, abspath, 'exec')
|
||||
|
||||
if os.path.basename(srcfile) == '__init__.py':
|
||||
|
||||
@@ -407,7 +407,7 @@ def main(*args):
|
||||
sys.path = [ os.path.dirname(sys.argv[0]) ] + sys.path
|
||||
|
||||
filename = sys.argv[0]
|
||||
filedata = file(filename, 'r').read()
|
||||
filedata = open(filename, 'r').read()
|
||||
filecode = compile(filedata, filename, 'exec')
|
||||
scope = { '__file__' : filename,
|
||||
'__name__' : '__m5_main__' }
|
||||
|
||||
@@ -92,7 +92,7 @@ def instantiate(ckpt_dir=None):
|
||||
for obj in root.descendants(): obj.unproxyParams()
|
||||
|
||||
if options.dump_config:
|
||||
ini_file = file(os.path.join(options.outdir, options.dump_config), 'w')
|
||||
ini_file = open(os.path.join(options.outdir, options.dump_config), 'w')
|
||||
# Print ini sections in sorted order for easier diffing
|
||||
for obj in sorted(root.descendants(), key=lambda o: o.path()):
|
||||
obj.print_ini(ini_file)
|
||||
@@ -101,7 +101,8 @@ def instantiate(ckpt_dir=None):
|
||||
if options.json_config:
|
||||
try:
|
||||
import json
|
||||
json_file = file(os.path.join(options.outdir, options.json_config), 'w')
|
||||
json_file = open(
|
||||
os.path.join(options.outdir, options.json_config), 'w')
|
||||
d = root.get_config_as_dict()
|
||||
json.dump(d, json_file, indent=4)
|
||||
json_file.close()
|
||||
|
||||
@@ -154,7 +154,7 @@ class code_formatter(object):
|
||||
self._data = []
|
||||
|
||||
def write(self, *args):
|
||||
f = file(os.path.join(*args), "w")
|
||||
f = open(os.path.join(*args), "w")
|
||||
for data in self._data:
|
||||
f.write(data)
|
||||
f.close()
|
||||
|
||||
@@ -115,7 +115,7 @@ class Grammar(object):
|
||||
def parse_file(self, f, **kwargs):
|
||||
if isinstance(f, basestring):
|
||||
source = f
|
||||
f = file(f, 'r')
|
||||
f = open(f, 'r')
|
||||
elif isinstance(f, file):
|
||||
source = f.name
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user