summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill <Bill@mediadog7-2>2016-05-14 22:37:00 (GMT)
committerBill <Bill@mediadog7-2>2016-05-14 22:37:00 (GMT)
commit96ba1793cf7346a6fdbee6bfd843cdbd3efebedf (patch)
treeae46268f4440a07983f78aa8b11ef79ee445098d
parent547a704c080c97304425fcde1eb2381d9f395352 (diff)
downloadSCons-96ba1793cf7346a6fdbee6bfd843cdbd3efebedf.zip
SCons-96ba1793cf7346a6fdbee6bfd843cdbd3efebedf.tar.gz
SCons-96ba1793cf7346a6fdbee6bfd843cdbd3efebedf.tar.bz2
Fix re-raising exception so the syntax will work for both python3 and python2.
-rw-r--r--src/engine/SCons/Taskmaster.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index ddafeb9..0f4fd21 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -22,6 +22,8 @@
from __future__ import print_function
+import sys
+
__doc__ = """
Generic Taskmaster module for the SCons build engine.
@@ -539,8 +541,11 @@ class Task(object):
except ValueError:
exc_type, exc_value = exc
exc_traceback = None
- # raise exc_type, exc_value, exc_traceback
- raise exc_type(exc_value).with_traceback(exc_traceback)
+
+ if sys.version_info[0] == 2:
+ exec("raise exc_type, exc_value, exc_traceback")
+ else: # sys.version_info[0] == 3:
+ exec("raise exc_type(exc_value).with_traceback(exc_traceback)")
# raise e.__class__, e.__class__(e), sys.exc_info()[2]