summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2018-08-08 16:52:35 +0100
committerAndrew Bartlett <abartlet@samba.org>2018-09-03 03:22:20 +0200
commit9688480dab2fef7124297e676ec2ea4e1f7a47c7 (patch)
tree7a194652f3e7975f79d5507ffbc7ea14bcb6784e /python
parent45c0ec855f80a4e1c61e28ec52a23542caa8a0bc (diff)
downloadsamba-9688480dab2fef7124297e676ec2ea4e1f7a47c7.tar.gz
python/samba: port open to io.open for PY2/PY3 compat
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r--python/samba/ms_display_specifiers.py3
-rw-r--r--python/samba/ms_schema.py3
2 files changed, 4 insertions, 2 deletions
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)))