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: bindmgr: fix iteration over bytes

Browse Source 
In py3 iteration over bytes returns integers, in py2 interation over
bytes returns string.

https://pagure.io/freeipa/issue/4985

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Martin Basti 2017-07-04 16:16:11 +02:00 committed by Christian Heimes
parent 84a10ee372
commit 53f202bdcc
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ipaserver/dnssec/bindmgr.py
View File

@ -11,6 +11,8 @@ import os
import shutil
import stat
import six
import ipalib.constants
from ipapython.dn import DN
from ipapython import ipautil
@ -141,17 +143,21 @@ class BINDMgr(object):
escaped = ""
for label in zone:
for char in label:
c = ord(char)
if ((c >= 0x30 and c <= 0x39) or # digit
(c >= 0x41 and c <= 0x5A) or # uppercase
(c >= 0x61 and c <= 0x7A) or # lowercase
c == 0x2D or # hyphen
c == 0x5F): # underscore
if (c >= 0x41 and c <= 0x5A): # downcase
c += 0x20
escaped += chr(c)
if six.PY2:
# PY3 char is already int
char = ord(char)
if (
(char >= 0x30 and char <= 0x39) or # digit
(char >= 0x41 and char <= 0x5A) or # uppercase
(char >= 0x61 and char <= 0x7A) or # lowercase
char == 0x2D or # hyphen
char == 0x5F # underscore
):
if char >= 0x41 and char <= 0x5A: # downcase
char += 0x20
escaped += chr(char)
else:
escaped += "%%%02X" % c
escaped += "%%%02X" % char
escaped += '.'
# strip trailing period