sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-15 16:59:09 +03:00
Code Activity

python/samba: port some isinstance str checks (to cater for unicode)

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
Noel Power
2018-04-26 10:38:57 +01:00
committed by Noel Power
parent b54472f868
commit 141d9081f4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/samba/ms_schema.py
View File

@ -21,6 +21,7 @@ from __future__ import print_function
import re
import base64
import uuid
from samba.compat import string_types
bitFields = {}
@ -172,7 +173,7 @@ def fix_dn(dn):
def __convert_bitfield(key, value):
"""Evaluate the OR expression in 'value'"""
assert(isinstance(value, str))
assert(isinstance(value, string_types))
value = value.replace("\n ", "")
value = value.replace(" ", "")
@ -194,7 +195,7 @@ def __write_ldif_one(entry):
out = []
for l in entry:
if isinstance(l[1], str):
if isinstance(l[1], string_types):
vl = [l[1]]
else:
vl = l[1]
@ -247,7 +248,7 @@ def __transform_entry(entry, objectClass):
l[1] = oMObjectClassBER[l[1].strip()]
l[2] = True
if isinstance(l[1], str):
if isinstance(l[1], string_types):
l[1] = fix_dn(l[1])
if key == 'dn':