summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/PharLapCommon.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-04-15 00:02:59 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-04-15 00:02:59 (GMT)
commit9931fe6c59d330d0dbeea1c51456e3a9f94377d8 (patch)
tree0e17c9808475e40bfad54db43529ad01d411e6c2 /src/engine/SCons/Tool/PharLapCommon.py
parent12ec17eedc70ee82421b27ff7dd84e947d4e6953 (diff)
downloadSCons-9931fe6c59d330d0dbeea1c51456e3a9f94377d8.zip
SCons-9931fe6c59d330d0dbeea1c51456e3a9f94377d8.tar.gz
SCons-9931fe6c59d330d0dbeea1c51456e3a9f94377d8.tar.bz2
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Apply the first part of the 'raise' fixer (the three-argument cases are not converted and will need to wait until native support of with_traceback() is available).
Diffstat (limited to 'src/engine/SCons/Tool/PharLapCommon.py')
-rw-r--r--src/engine/SCons/Tool/PharLapCommon.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/PharLapCommon.py b/src/engine/SCons/Tool/PharLapCommon.py
index dc124b5..9f925b9 100644
--- a/src/engine/SCons/Tool/PharLapCommon.py
+++ b/src/engine/SCons/Tool/PharLapCommon.py
@@ -45,7 +45,7 @@ def getPharLapPath():
be found."""
if not SCons.Util.can_read_reg:
- raise SCons.Errors.InternalError, "No Windows registry module was found"
+ raise SCons.Errors.InternalError("No Windows registry module was found")
try:
k=SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE,
'SOFTWARE\\Pharlap\\ETS')
@@ -61,7 +61,7 @@ def getPharLapPath():
return os.path.normpath(val)
except SCons.Util.RegError:
- raise SCons.Errors.UserError, "Cannot find Phar Lap ETS path in the registry. Is it installed properly?"
+ raise SCons.Errors.UserError("Cannot find Phar Lap ETS path in the registry. Is it installed properly?")
REGEX_ETS_VER = re.compile(r'#define\s+ETS_VER\s+([0-9]+)')
@@ -78,7 +78,7 @@ def getPharLapVersion():
include_path = os.path.join(getPharLapPath(), os.path.normpath("include/embkern.h"))
if not os.path.exists(include_path):
- raise SCons.Errors.UserError, "Cannot find embkern.h in ETS include directory.\nIs Phar Lap ETS installed properly?"
+ raise SCons.Errors.UserError("Cannot find embkern.h in ETS include directory.\nIs Phar Lap ETS installed properly?")
mo = REGEX_ETS_VER.search(open(include_path, 'r').read())
if mo:
return int(mo.group(1))