]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
[v9_10] python 3 compatibility
authorEvan Hunt <each@isc.org>
Fri, 21 Apr 2017 00:31:25 +0000 (17:31 -0700)
committerEvan Hunt <each@isc.org>
Fri, 21 Apr 2017 00:31:25 +0000 (17:31 -0700)
4591. [port] Addressed some python 3 compatibility issues.
Thanks to Ville Skytta. [RT #44955] [RT #44956]

(cherry picked from commit 6d19d975c6ce91ed3b2b13c2a3221bd6686f4128)

CHANGES
bin/python/isc/coverage.py.in

diff --git a/CHANGES b/CHANGES
index 8c6370ed69aafba94c6114045fe5f273b511cc47..baeec24538ccca0acf2bf115a0f4192a181e0863 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]
 
index fe566275bcc54cf08cc4e88e3b5028a11101d2e5..809076c23d8c3cfdbe4d27197134d2ca04f6b927 100644 (file)
@@ -81,7 +81,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)