explicitly convert byte to string

(cherry picked from commit ec3d830bc50e43858c7982df9b9db95aa8cffca0)

diff --git a/bin/python/isc/checkds.py.in b/bin/python/isc/checkds.py.in
index 5669e6879d12bdcec03864aaaa518f70ce3172ba..9d6429c0b679da6f76031c2e4da7e809711641a5 100644 (file)
--- a/bin/python/isc/checkds.py.in
+++ b/bin/python/isc/checkds.py.in
@@ -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:

diff --git a/bin/python/isc/keyzone.py.in b/bin/python/isc/keyzone.py.in
index 2451d439e4b867fa61b2a537af7a0ff5b94beb6d..bc8c51d72fbcff4b905ccc7fd18d6bf659bc50b5 100644 (file)
--- a/bin/python/isc/keyzone.py.in
+++ b/bin/python/isc/keyzone.py.in
@@ -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()