explicitly convert byte to string

(cherry picked from commit ec3d830bc5)
This commit is contained in:
Mark Andrews
2019-02-18 16:36:59 +11:00
committed by Evan Hunt
parent 45dec7d781
commit 6f48cea0a6
2 changed files with 11 additions and 1 deletions

View File

@@ -37,7 +37,11 @@ class SECRR:
if not rrtext:
raise Exception
fields = rrtext.decode('ascii').split()
# 'str' does not have decode method in python3
if type(rrtext) is not str:
fields = rrtext.decode('ascii').split()
else:
fields = rrtext.split()
if len(fields) < 7:
raise Exception
@@ -99,6 +103,8 @@ def check(zone, args, masterfile=None, lookaside=None):
fp, _ = Popen(cmd, stdout=PIPE).communicate()
for line in fp.splitlines():
if type(line) is not str:
line = line.decode('ascii')
rrlist.append(SECRR(line, lookaside))
rrlist = sorted(rrlist, key=lambda rr: (rr.keyid, rr.keyalg, rr.hashalg))
@@ -120,6 +126,8 @@ def check(zone, args, masterfile=None, lookaside=None):
fp, _ = Popen(cmd, stdin=PIPE, stdout=PIPE).communicate(intods)
for line in fp.splitlines():
if type(line) is not str:
line = line.decode('ascii')
klist.append(SECRR(line, lookaside))
if len(klist) < 1:

View File

@@ -43,6 +43,8 @@ class keyzone:
fp, _ = Popen([czpath, "-o", "-", name, filename],
stdout=PIPE, stderr=PIPE).communicate()
for line in fp.splitlines():
if type(line) is not str:
line = line.decode('ascii')
if re.search('^[:space:]*;', line):
continue
fields = line.split()