|
 |
29fb7e3 |
diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py
|
|
|
29fb7e3 |
index 8212586..8142817 100644
|
|
|
29fb7e3 |
--- a/waflib/ConfigSet.py
|
|
|
29fb7e3 |
+++ b/waflib/ConfigSet.py
|
|
|
29fb7e3 |
@@ -146,7 +146,7 @@ class ConfigSet(object):
|
|
|
29fb7e3 |
Utils.writef(filename,''.join(buf))
|
|
|
29fb7e3 |
def load(self,filename):
|
|
|
29fb7e3 |
tbl=self.table
|
|
|
29fb7e3 |
- code=Utils.readf(filename,m='rU')
|
|
|
29fb7e3 |
+ code=Utils.readf(filename,m='r')
|
|
|
29fb7e3 |
for m in re_imp.finditer(code):
|
|
|
29fb7e3 |
g=m.group
|
|
|
29fb7e3 |
tbl[g(2)]=eval(g(3))
|
|
|
29fb7e3 |
diff --git a/waflib/Context.py b/waflib/Context.py
|
|
|
29fb7e3 |
index ab6b154..cbe16c1 100644
|
|
|
29fb7e3 |
--- a/waflib/Context.py
|
|
|
29fb7e3 |
+++ b/waflib/Context.py
|
|
|
29fb7e3 |
@@ -106,7 +106,7 @@ class Context(ctx):
|
|
|
29fb7e3 |
cache[node]=True
|
|
|
29fb7e3 |
self.pre_recurse(node)
|
|
|
29fb7e3 |
try:
|
|
|
29fb7e3 |
- function_code=node.read('rU',encoding)
|
|
|
29fb7e3 |
+ function_code=node.read('r',encoding)
|
|
|
29fb7e3 |
exec(compile(function_code,node.abspath(),'exec'),self.exec_dict)
|
|
|
29fb7e3 |
finally:
|
|
|
29fb7e3 |
self.post_recurse(node)
|
|
|
29fb7e3 |
@@ -346,7 +346,7 @@ def load_module(path,encoding=None):
|
|
|
29fb7e3 |
pass
|
|
|
29fb7e3 |
module=imp.new_module(WSCRIPT_FILE)
|
|
|
29fb7e3 |
try:
|
|
|
29fb7e3 |
- code=Utils.readf(path,m='rU',encoding=encoding)
|
|
|
29fb7e3 |
+ code=Utils.readf(path,m='r',encoding=encoding)
|
|
|
29fb7e3 |
except EnvironmentError:
|
|
|
29fb7e3 |
raise Errors.WafError('Could not read the file %r'%path)
|
|
|
29fb7e3 |
module_dir=os.path.dirname(path)
|