The branch, v4-10-test has been updated
via 9b805c08442 wafsamba: Do not use 'rU' as the 'U' is deprecated in
Python 3.9
from ee7e298bd70 s3: VFS: full_audit. Use system session_info if called
from a temporary share definition.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-10-test
- Log -----------------------------------------------------------------
commit 9b805c084429d7b351114b91b78f46433793d28a
Author: Andreas Schneider <a...@samba.org>
Date: Wed Feb 5 16:58:26 2020 +0100
wafsamba: Do not use 'rU' as the 'U' is deprecated in Python 3.9
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 <a...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Thu Feb 6 07:30:13 UTC 2020 on sn-devel-184
(cherry picked from commit 52722746a5eb40c309ba59f78bd8e3d897417bdc)
Autobuild-User(v4-10-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-10-test): Mon Feb 24 11:28:18 UTC 2020 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
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)
--
Samba Shared Repository
