diff options
Diffstat (limited to 'waflib/Context.py')
| -rw-r--r-- | waflib/Context.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/waflib/Context.py b/waflib/Context.py index 21f2145..ab6b154 100644 --- a/waflib/Context.py +++ b/waflib/Context.py @@ -5,9 +5,9 @@ import os,re,imp,sys from waflib import Utils,Errors,Logs import waflib.Node -HEXVERSION=0x2000b00 -WAFVERSION="2.0.11" -WAFREVISION="a97f6fb0941091b4966b625f15ec32fa783a8bec" +HEXVERSION=0x2000e00 +WAFVERSION="2.0.14" +WAFREVISION="907519cab9c1c8c7e4f7d4e468ed6200b9250d58" ABI=20 DBFILE='.wafpickle-%s-%d-%d'%(sys.platform,sys.hexversion,ABI) APPNAME='APPNAME' @@ -172,8 +172,8 @@ class Context(ctx): encoding=kw.pop('decode_as',default_encoding) try: ret,out,err=Utils.run_process(cmd,kw,cargs) - except Exception ,e: - raise Errors.WafError('Execution failure: %s'%str(e),ex=e),None,sys.exc_info()[2] + except Exception as e: + raise Errors.WafError('Execution failure: %s'%str(e),ex=e) if out: if not isinstance(out,str): out=out.decode(encoding,errors='replace') @@ -218,8 +218,8 @@ class Context(ctx): encoding=kw.pop('decode_as',default_encoding) try: ret,out,err=Utils.run_process(cmd,kw,cargs) - except Exception ,e: - raise Errors.WafError('Execution failure: %s'%str(e),ex=e),None,sys.exc_info()[2] + except Exception as e: + raise Errors.WafError('Execution failure: %s'%str(e),ex=e) if not isinstance(out,str): out=out.decode(encoding,errors='replace') if not isinstance(err,str): @@ -371,7 +371,7 @@ def load_tool(tool,tooldir=None,ctx=None,with_sys_path=True): sys.path=tooldir+sys.path try: __import__(tool) - except ImportError ,e: + except ImportError as e: e.waf_sys_path=list(sys.path) raise finally: @@ -392,7 +392,7 @@ def load_tool(tool,tooldir=None,ctx=None,with_sys_path=True): x=None else: __import__(tool) - except ImportError ,e: + except ImportError as e: e.waf_sys_path=list(sys.path) raise finally: |