[master] python 3 compatibility

4591.	[port]		Addressed some python 3 compatibility issues.
			Thanks to Ville Skytta. [RT #44955] [RT #44956]

diff --git a/CHANGES b/CHANGES
index 1550160bc2ec2104d66177f3440997a88d80a9e5..9f91f992eb2923c4bfe010c3fd13ed1b6186967b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4591.  [port]          Addressed some python 3 compatibility issues.
+                       Thanks to Ville Skytta. [RT #44955] [RT #44956]
+
 4590.  [bug]           Support for PTHREAD_MUTEX_ADAPTIVE_NP was not being
                        properly detected. [RT #44871]
 

diff --git a/bin/python/isc/coverage.py.in b/bin/python/isc/coverage.py.in
index 00eb9e05f1cdbcfebc419de96ed2384c981e6fb1..9d06b9c200f8fbcd5f51e2ed9000505318a42e76 100644 (file)
--- a/bin/python/isc/coverage.py.in
+++ b/bin/python/isc/coverage.py.in
@@ -73,7 +73,7 @@ def parse_time(s):
         pass
 
     # try to parse as a number with a suffix indicating unit of time
-    r = re.compile('([0-9][0-9]*)\s*([A-Za-z]*)')
+    r = re.compile(r'([0-9][0-9]*)\s*([A-Za-z]*)')
     m = r.match(s)
     if not m:
         raise ValueError("Cannot parse %s" % s)

diff --git a/bin/tests/system/dnstap/ydump.py b/bin/tests/system/dnstap/ydump.py
index 04d0bc4791b537cf11203ed221e27287f006f8ab..971f1c2f7be434497af5a147de99ef33cd99d163 100644 (file)
--- a/bin/tests/system/dnstap/ydump.py
+++ b/bin/tests/system/dnstap/ydump.py
@@ -9,7 +9,7 @@
 try:
     import yaml
 except:
-    print "I: No python yaml module, skipping"
+    print("I: No python yaml module, skipping")
     exit(1)
 
 import subprocess