From: Mark Andrews <marka@isc.org>
Date: Mon, 23 Jun 2014 04:46:34 +0000 (+1000)
Subject: 3885.   [port]          Use 'open()' rather than 'file()' to open files in
X-Git-Tag: v9.10.1b1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc152ad50f8255cd7b830026123d86040a1167e2;p=thirdparty%2Fbind9.git

3885.   [port]          Use 'open()' rather than 'file()' to open files in
                        python.

(cherry picked from commit bf59efcf0ed41186a5f9c1ca61da15a3c99b46f3)
---

diff --git a/CHANGES b/CHANGES
index 54720c5d8bd..8523ecf0b2e 100644
--- 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.
diff --git a/bin/python/dnssec-coverage.py.in b/bin/python/dnssec-coverage.py.in
index 6aded9ae191..0f352c15a34 100755
--- a/bin/python/dnssec-coverage.py.in
+++ b/bin/python/dnssec-coverage.py.in
@@ -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()