wafsamba: Do not use 'rU' as the 'U' is deprecated in Python 3.9
authorAndreas Schneider <asn@samba.org>
Wed, 5 Feb 2020 15:58:26 +0000 (16:58 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Thu, 6 Feb 2020 07:30:13 +0000 (07:30 +0000)
See https://docs.python.org/3.9/whatsnew/3.9.html#changes-in-the-python-api

"open(), io.open(), codecs.open() and fileinput.FileInput no longer accept 'U'
(“universal newline”) in the file mode. This flag was deprecated since Python
3.3. In Python 3, the “universal newline” is used by default when a file is
open in text mode. The newline parameter of open() controls how universal
newlines works."

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14266

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Feb  6 07:30:13 UTC 2020 on sn-devel-184

buildtools/wafsamba/samba_utils.py

index 4a5a34abae7a7aa561d6167e232bbb5697d5d961..f9eae73ae449833bc70a0a9836ec6e0bbe878857 100644 (file)
@@ -682,7 +682,7 @@ def PROCESS_SEPARATE_RULE(self, rule):
             cache[node] = True
             self.pre_recurse(node)
             try:
-                function_code = node.read('rU', None)
+                function_code = node.read('r', None)
                 exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
             finally:
                 self.post_recurse(node)