[master] address some python2/3 incompatibilities

bin/python/isc/dnskey.py

@@ -48,8 +48,7 @@ class dnskey:
             self.fromtuple(name, alg, keyid, keyttl)
 
         self._dir = directory or os.path.dirname(key) or '.'
-        key = os.path.basename(key)
-
+        key = os.path.basename(key).decode('ascii')
         (name, alg, keyid) = key.split('+')
         name = name[1:-1]
         alg = int(alg)

bin/python/isc/policy.py

@@ -102,7 +102,7 @@ class PolicyLex:
 
     def __init__(self, **kwargs):
         for r in self.reserved:
-            self.reserved_map[r.lower().translate(maketrans('_', '-'))] = r
+            self.reserved_map[r.lower().translate(str.maketrans('_', '-'))] = r
         self.lexer = lex.lex(object=self, **kwargs)
 
     def test(self, text):