IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

py3: _convert_to_idna: fix bytes/unicode mistmatch

Browse Source 
ToASCII() returns bytes, it must be decoded to unicode

https://fedorahosted.org/freeipa/ticket/4985

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Martin Basti
2017-01-27 12:06:54 +01:00
committed by Jan Cholasta
parent 03d0a55e8a
commit a584758cfb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ipaserver/plugins/dns.py
View File

@@ -1620,7 +1620,8 @@ def _convert_to_idna(value):
idna_val = encodings.idna.nameprep(idna_val) idna_val = encodings.idna.nameprep(idna_val)
idna_val = re.split(r'(?<!\\)\.', idna_val) idna_val = re.split(r'(?<!\\)\.', idna_val)
idna_val = u'%s%s%s' % (start_dot, idna_val = u'%s%s%s' % (start_dot,
u'.'.join(encodings.idna.ToASCII(x) u'.'.join(
encodings.idna.ToASCII(x).decode('ascii')
for x in idna_val), for x in idna_val),
end_dot) end_dot)
return idna_val return idna_val