From 31dff7faa0a0be22e70376a49748cf4b8f1eb5f9 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 25 Jan 2019 12:04:31 +0000 Subject: python: Update use of exec to work with Python 3 Python 3 uses 'exec(code, globals)' instead of 'exec code in globals'. Switch to the newer syntax since it is supported by Python 2.7. Also, move check_tracing out of main to work around a bug in Python 2.7. Change-Id: I6d390160f58783e1b038a572b64cdf3ff09535fa Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/15986 Reviewed-by: Jason Lowe-Power --- src/python/m5/util/jobfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/python/m5/util') diff --git a/src/python/m5/util/jobfile.py b/src/python/m5/util/jobfile.py index ad5b5ff5c..613289a81 100644 --- a/src/python/m5/util/jobfile.py +++ b/src/python/m5/util/jobfile.py @@ -417,7 +417,7 @@ def JobFile(jobfile): raise AttributeError("Could not find file '%s'" % jobfile) data = {} - execfile(filename, data) + exec(compile(open(filename).read(), filename, 'exec'), data) if 'conf' not in data: raise ImportError('cannot import name conf from %s' % jobfile) return data['conf'] -- cgit v1.2.3