[master] address some python2/3 incompatibilities

diff --git a/bin/python/isc/dnskey.py b/bin/python/isc/dnskey.py
index 10c14b96640efdda52f83247ceaab88aa55c9791..fa7e9c4a3dfe11ce4cecab2d3abb8f7d72d4e87d 100644 (file)
--- a/bin/python/isc/dnskey.py
+++ b/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)

diff --git a/bin/python/isc/policy.py b/bin/python/isc/policy.py
index 3a04d6ab97b3dd1e2547b8eb1ccae32191e26096..14fd8535daa3e7d812e7fa72b730eff3674f023b 100644 (file)
--- a/bin/python/isc/policy.py
+++ b/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):