From bb66af95a7e13f433466f612eded97b01e48b6fc Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Sep 2017 14:09:01 +0100 Subject: scons: use python3-compatible exceptions These changes were generated using python's `2to3` tool. Signed-off-by: Eric Engestrom --- scons/crossmingw.py | 2 +- scons/dxsdk.py | 2 +- scons/llvm.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scons') diff --git a/scons/crossmingw.py b/scons/crossmingw.py index 34129450a56..609cd00418e 100644 --- a/scons/crossmingw.py +++ b/scons/crossmingw.py @@ -83,7 +83,7 @@ def shlib_emitter(target, source, env): no_import_lib = env.get('no_import_lib', 0) if not dll: - raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX") + raise SCons.Errors.UserError("A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")) if not no_import_lib and \ not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'): diff --git a/scons/dxsdk.py b/scons/dxsdk.py index 920cc2f689d..9657f58f4d2 100644 --- a/scons/dxsdk.py +++ b/scons/dxsdk.py @@ -51,7 +51,7 @@ def generate(env): elif env['machine'] == 'x86_64': target_cpu = 'x64' else: - raise SCons.Errors.InternalError, "Unsupported target machine" + raise SCons.Errors.InternalError("Unsupported target machine") include_dir = os.path.join(dxsdk_root, 'Include') lib_dir = os.path.join(dxsdk_root, 'Lib', target_cpu) diff --git a/scons/llvm.py b/scons/llvm.py index eaa2ecbe026..79118be371d 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -50,7 +50,7 @@ def generate(env): llvm_dir = None else: if not os.path.isdir(llvm_dir): - raise SCons.Errors.InternalError, "Specified LLVM directory not found" + raise SCons.Errors.InternalError("Specified LLVM directory not found") if env['debug']: llvm_subdir = 'Debug' @@ -61,7 +61,7 @@ def generate(env): if not os.path.isdir(llvm_bin_dir): llvm_bin_dir = os.path.join(llvm_dir, 'bin') if not os.path.isdir(llvm_bin_dir): - raise SCons.Errors.InternalError, "LLVM binary directory not found" + raise SCons.Errors.InternalError("LLVM binary directory not found") env.PrependENVPath('PATH', llvm_bin_dir) -- cgit v1.2.1