34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
U is included by default and deprecated since 3.3 and an error since 3.11
|
||
|
|
|
||
|
|
--- a/waflib/ConfigSet.py
|
||
|
|
+++ b/waflib/ConfigSet.py
|
||
|
|
@@ -146,7 +146,7 @@ class ConfigSet(object):
|
||
|
|
Utils.writef(filename,''.join(buf))
|
||
|
|
def load(self,filename):
|
||
|
|
tbl=self.table
|
||
|
|
- code=Utils.readf(filename,m='rU')
|
||
|
|
+ code=Utils.readf(filename,m='r')
|
||
|
|
for m in re_imp.finditer(code):
|
||
|
|
g=m.group
|
||
|
|
tbl[g(2)]=eval(g(3))
|
||
|
|
--- a/waflib/Context.py
|
||
|
|
+++ b/waflib/Context.py
|
||
|
|
@@ -106,7 +106,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)
|
||
|
|
@@ -346,7 +346,7 @@ def load_module(path,encoding=None):
|
||
|
|
pass
|
||
|
|
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)
|
||
|
|
module_dir=os.path.dirname(path)
|