From a39c8db854c8e2a2c9101f556e67cad883ece433 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 2 Dec 2019 17:52:44 -0800 Subject: scons: Fixes to improve python 3 support. Some simple fixes to improve python 3 compatability in scons. Change-Id: I89aba6ed9d73ee733307c57e033c636029d9cb7a Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23264 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- SConstruct | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 9a382102c..5a90808b1 100755 --- a/SConstruct +++ b/SConstruct @@ -206,7 +206,7 @@ def rfind(l, elt, offs = -1): for i in range(len(l)+offs, 0, -1): if l[i] == elt: return i - raise ValueError, "element not found" + raise ValueError("element not found") # Take a list of paths (or SCons Nodes) and return a list with all # paths made absolute and ~-expanded. Paths will be interpreted @@ -717,7 +717,8 @@ if main['USE_PYTHON']: # verify that this stuff works if not conf.CheckHeader('Python.h', '<>'): - error("Check failed for Python.h header in", py_includes, "\n" + error("Check failed for Python.h header in", + ' '.join(py_includes), "\n" "Two possible reasons:\n" "1. Python headers are not installed (You can install the " "package python-dev on Ubuntu and RedHat)\n" @@ -941,7 +942,7 @@ class CpuModel(object): # Add self to dict if name in CpuModel.dict: - raise AttributeError, "CpuModel '%s' already registered" % name + raise AttributeError("CpuModel '%s' already registered" % name) CpuModel.dict[name] = self Export('CpuModel') -- cgit v1.2.3