]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
3885. [port] Use 'open()' rather than 'file()' to open files in v9.10.1b1
authorMark Andrews <marka@isc.org>
Mon, 23 Jun 2014 04:46:34 +0000 (14:46 +1000)
committerMark Andrews <marka@isc.org>
Mon, 23 Jun 2014 04:47:35 +0000 (14:47 +1000)
                        python.

(cherry picked from commit bf59efcf0ed41186a5f9c1ca61da15a3c99b46f3)

CHANGES
bin/python/dnssec-coverage.py.in

diff --git a/CHANGES b/CHANGES
index 54720c5d8bd53ca8abcd49ba010a63000c6feb53..8523ecf0b2effe74a15c84c067c9f6cf6b7f07f0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
        --- 9.10.1b1 released ---
 
+3885.  [port]          Use 'open()' rather than 'file()' to open files in
+                       python.
+
 3884.  [protocol]      Add CDS and CDNSKEY record types. [RT #36333]
 
 3881.  [bug]           Address memory leak with UPDATE error handling.
index 6aded9ae1916d57b546369d352c698fe2a647126..0f352c15a34ea7b79581aaaed43ca61f8a9e95c5 100755 (executable)
@@ -104,7 +104,7 @@ class Key:
         self.alg = int(alg)
         self.keyid = int(keyid)
 
-        kfp = file(key_file, "r")
+        kfp = open(key_file, "r")
         for line in kfp:
             if line[0] == ';':
                 continue
@@ -132,7 +132,7 @@ class Key:
                 self.sep = False
         kfp.close()
 
-        pfp = file(private_file, "rU")
+        pfp = open(private_file, "rU")
         propDict = dict()
         for propLine in pfp:
             propDef = propLine.strip()