[Mesa-dev] [PATCH mesa v2] scons: use python3-compatible exceptions

Eric Engestrom eric.engestrom at imgtec.com
Wed Sep 20 10:13:27 UTC 2017


Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
 scons/crossmingw.py | 2 +-
 scons/dxsdk.py      | 2 +-
 scons/llvm.py       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 34129450a56cdf14d8da..609cd00418e4ce9e8f1d 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 920cc2f689d1df31b12e..9657f58f4d24d0cb4a96 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 eaa2ecbe026cdcfe3d12..79118be371d113c81e04 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)
 
-- 
Cheers,
  Eric



More information about the mesa-dev mailing list