37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
U is included by default and deprecated since 3.3 and an error since 3.11
|
||
|
|
||
|
https://github.com/jackaudio/jack2/issues/898
|
||
|
adapted from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
|
||
|
|
||
|
--- a/waflib/ConfigSet.py
|
||
|
+++ b/waflib/ConfigSet.py
|
||
|
@@ -312,7 +312,7 @@ class ConfigSet(object):
|
||
|
:type filename: string
|
||
|
"""
|
||
|
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
|
||
|
@@ -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)
|
||
|
@@ -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)
|
||
|
|