[SCM] Samba Shared Repository - branch v4-12-test updated

[Karolin Seeger]

The branch, v4-12-test has been updated
       via  d0a0bcf67c8 wafsamba: Do not use 'rU' as the 'U' is deprecated in Python 3.9
      from  044a1fee5f7 WHATSNEW: Add some more changes since 4.11.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-test


- Log -----------------------------------------------------------------
commit d0a0bcf67c8b9a1d4fd9482e82c809e950140087
Author: Andreas Schneider <asn at 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 <asn at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Autobuild-User(master): Andreas Schneider <asn at 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-12-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-12-test): Thu Feb  6 13:10:31 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

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 4a5a34abae7..f9eae73ae44 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -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)


-- 
Samba Shared Repository