From: Evan Hunt <each@isc.org>
Date: Fri, 21 Apr 2017 00:30:35 +0000 (-0700)
Subject: [master] python 3 compatibility
X-Git-Tag: v9.12.0a1~374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d19d975c6ce91ed3b2b13c2a3221bd6686f4128;p=thirdparty%2Fbind9.git

[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 1550160bc2e..9f91f992eb2 100644
--- 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 00eb9e05f1c..9d06b9c200f 100644
--- 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 04d0bc4791b..971f1c2f7be 100644
--- 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