sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-28 11:42:03 +03:00
Code Activity

python compat: remove string_types

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2020-07-04 13:47:44 +12:00
committed by Noel Power
parent 323073f4e0
commit 9cc65a552b
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/samba/ms_schema.py
View File

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