diff options
| author | David Robillard <d@drobilla.net> | 2019-03-17 17:31:04 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-03-17 18:14:27 +0100 |
| commit | a31cace29a936dfff80c16d25a5c24d783c9611f (patch) | |
| tree | 9a5aa34548658092800c7f9fc799170500c5e55e /waflib/Context.py | |
| parent | 04129c016c366332c89b7068b11b37c0843e20eb (diff) | |
| parent | 619946be846e7cfa9b79ccd433746f172ccdefc3 (diff) | |
| download | sratom-a31cace29a936dfff80c16d25a5c24d783c9611f.tar.gz sratom-a31cace29a936dfff80c16d25a5c24d783c9611f.tar.bz2 sratom-a31cace29a936dfff80c16d25a5c24d783c9611f.zip | |
Update autowaf and adapt to new API
Diffstat (limited to 'waflib/Context.py')
| -rw-r--r-- | waflib/Context.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/waflib/Context.py b/waflib/Context.py index bb47c92..876ea46 100644 --- a/waflib/Context.py +++ b/waflib/Context.py @@ -11,13 +11,13 @@ from waflib import Utils, Errors, Logs import waflib.Node # the following 3 constants are updated on each new release (do not touch) -HEXVERSION=0x2000b00 +HEXVERSION=0x2000f00 """Constant updated on new releases""" -WAFVERSION="2.0.11" +WAFVERSION="2.0.15" """Constant updated on new releases""" -WAFREVISION="a97f6fb0941091b4966b625f15ec32fa783a8bec" +WAFREVISION="503db290b73ef738a495e0d116d6f8ee0b98dcc2" """Git revision when the waf version is updated""" ABI = 20 @@ -266,7 +266,7 @@ class Context(ctx): cache[node] = True self.pre_recurse(node) try: - function_code = node.read('rU', encoding) + function_code = node.read('r', encoding) exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) finally: self.post_recurse(node) @@ -613,7 +613,7 @@ class Context(ctx): is typically called once for a programming language group, see for example :py:mod:`waflib.Tools.compiler_c` - :param var: glob expression, for example 'cxx\_\*.py' + :param var: glob expression, for example 'cxx\\_\\*.py' :type var: string :param ban: list of exact file names to exclude :type ban: list of string @@ -662,7 +662,7 @@ def load_module(path, encoding=None): module = imp.new_module(WSCRIPT_FILE) try: - code = Utils.readf(path, m='rU', encoding=encoding) + code = Utils.readf(path, m='r', encoding=encoding) except EnvironmentError: raise Errors.WafError('Could not read the file %r' % path) @@ -678,7 +678,7 @@ def load_module(path, encoding=None): def load_tool(tool, tooldir=None, ctx=None, with_sys_path=True): """ - Importx a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` + Imports a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` :type tool: string :param tool: Name of the tool |