From d953afece72c30d19fb14946128e600038c20197 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 5 Feb 2020 16:58:26 +0100 Subject: [PATCH] wafsamba: Do not use 'rU' as the 'U' is deprecated in Python 3.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Douglas Bagnall Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 6 07:30:13 UTC 2020 on sn-devel-184 (cherry picked from commit 52722746a5eb40c309ba59f78bd8e3d897417bdc) --- buildtools/wafsamba/samba_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index bc36d1f194d..086040ebfee 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -687,7 +687,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) -- 2.17.1