From: Noel Power Date: Wed, 8 Aug 2018 15:52:35 +0000 (+0100) Subject: python/samba: port open to io.open for PY2/PY3 compat X-Git-Tag: tdb-1.3.17~1944 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9688480dab2fef7124297e676ec2ea4e1f7a47c7;p=thirdparty%2Fsamba.git python/samba: port open to io.open for PY2/PY3 compat Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/ms_display_specifiers.py b/python/samba/ms_display_specifiers.py index 2a81c2299c8..7488b197a4a 100644 --- a/python/samba/ms_display_specifiers.py +++ b/python/samba/ms_display_specifiers.py @@ -176,7 +176,8 @@ def read_ms_ldif(filename): out = [] - f = open(filename, "rU") + from io import open + f = open(filename, "r", encoding='latin-1') for entry in __read_raw_entries(f): out.append(__write_ldif_one(__transform_entry(entry))) diff --git a/python/samba/ms_schema.py b/python/samba/ms_schema.py index 52abe74057a..4946636cbd4 100644 --- a/python/samba/ms_schema.py +++ b/python/samba/ms_schema.py @@ -295,7 +295,8 @@ def __parse_schema_file(filename, objectClass): out = [] - f = open(filename, "rU") + from io import open + f = open(filename, "r", encoding='latin-1') for entry in __read_raw_entries(f): out.append(__write_ldif_one(__transform_entry(entry, objectClass)))