IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-22 15:13:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Py3: Replace six.bytes_type with bytes

Browse Source 
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:46:45 +02:00
parent 61156b0a50
commit ed967ec24d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipapython/ipautil.py
View File

@ -1439,13 +1439,13 @@ if six.PY2:
Decode argument using the file system encoding, as returned by
`sys.getfilesystemencoding()`.
"""
if isinstance(value, six.binary_type):
if isinstance(value, bytes):
return value.decode(sys.getfilesystemencoding())
elif isinstance(value, str):
return value
else:
raise TypeError("expect {0} or {1}, not {2}".format(
six.binary_type.__name__,
bytes.__name__,
str.__name__,
type(value).__name__))
else:

2
ipapython/kerberos.py
View File

@ -66,7 +66,7 @@ class Principal:
Container for the principal name and realm according to RFC 1510
"""
def __init__(self, components, realm=None):
if isinstance(components, six.binary_type):
if isinstance(components, bytes):
raise TypeError(
"Cannot create a principal object from bytes: {!r}".format(
components)