Attachment 15802 Details for Bug 14266 – patch for Samba 4.11 (cherry-picked from master patch)

[patch] patch for Samba 4.11 (cherry-picked from master patch)

0001-wafsamba-Do-not-use-rU-as-the-U-is-deprecated-in-Pyt.patch (text/plain), 1.77 KB, created by Andrew Bartlett on 2020-02-20 22:23:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2020-02-20 22:23:36 UTC

Size: 1.77 KB

patch

obsolete

>From 0343b608303f136cbcc9a52ca1520c91ca902572 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>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 <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
>
>(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 ad97de1859b..be022adc8f5 100644
>--- a/buildtools/wafsamba/samba_utils.py
>+++ b/buildtools/wafsamba/samba_utils.py
>@@ -700,7 +700,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
>

Flags:

ab: review+

Actions: View

Attachments on bug 14266: 15775 | 15802 | 15806