Py3: Replace six.text_type with str

On Python 3, six.text_type (singular) is an alias for str.

See: https://pagure.io/freeipa/issue/7715
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
Christian Heimes
2018-09-26 12:39:56 +02:00
parent ea396528b7
commit 61156b0a50
15 changed files with 25 additions and 31 deletions

View File

@@ -910,7 +910,7 @@ class LDAPClient:
else:
return b'FALSE'
elif isinstance(val, (unicode, int, Decimal, DN, Principal)):
return six.text_type(val).encode('utf-8')
return str(val).encode('utf-8')
elif isinstance(val, DNSName):
return val.to_text().encode('ascii')
elif isinstance(val, bytes):
@@ -1295,7 +1295,7 @@ class LDAPClient:
value = u'\\'.join(
value[i:i+2] for i in six.moves.range(-2, len(value), 2))
else:
value = six.text_type(value)
value = str(value)
value = ldap.filter.escape_filter_chars(value)
if not exact: