[12/24] pynfs: python3 support plan: file() -> open()

Commit Message

Jianhong Yin July 24, 2018, 7:33 a.m. UTC

From: "Jianhong.Yin" <[e-mail]>

Signed-off-by: Jianhong Yin <[e-mail]>
---
 nfs4.0/testserver.py | 2 +-
 nfs4.1/testclient.py | 2 +-
 nfs4.1/testserver.py | 2 +-
 showresults.py       | 2 +-
 xdr/xdrgen.py        | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/nfs4.0/testserver.py b/nfs4.0/testserver.py
index 96012a1..fcee8e9 100755
--- a/nfs4.0/testserver.py
+++ b/nfs4.0/testserver.py
@@ -354,7 +354,7 @@  def main():
         print(sys.exc_info()[1])
         sys.exit(1)
     if opt.outfile is not None:
-        fd = file(opt.outfile, 'w')
+        fd = open(opt.outfile, 'w')
     try:
         clean_finish = False
         testmod.runtests(tests, opt, env, run_filter)
diff --git a/nfs4.1/testclient.py b/nfs4.1/testclient.py
index 1027fa6..47b74bd 100755
--- a/nfs4.1/testclient.py
+++ b/nfs4.1/testclient.py
@@ -313,7 +313,7 @@  def main():
         print(sys.exc_info()[1])
         sys.exit(1)
     if opt.outfile is not None:
-        fd = file(opt.outfile, 'w')
+        fd = open(opt.outfile, 'w')
     try:
         clean_finish = False
         testmod.runtests(tests, opt, env, run_filter)
diff --git a/nfs4.1/testserver.py b/nfs4.1/testserver.py
index 101cfb1..c21221e 100755
--- a/nfs4.1/testserver.py
+++ b/nfs4.1/testserver.py
@@ -333,7 +333,7 @@  def main():
         print(sys.exc_info()[1])
         sys.exit(1)
     if opt.outfile is not None:
-        fd = file(opt.outfile, 'w')
+        fd = open(opt.outfile, 'w')
     try:
         clean_finish = False
         testmod.runtests(tests, opt, env, run_filter)
diff --git a/showresults.py b/showresults.py
index 962407d..ed23f7b 100755
--- a/showresults.py
+++ b/showresults.py
@@ -38,7 +38,7 @@  class MyUnpickler(pickle.Unpickler):
             return self.Unknown(name)
 
 def show(filename, opt):
-    fd = file(filename, 'r')
+    fd = open(filename, 'r')
     p = MyUnpickler(fd)
     tests = p.load()
     testmod.printresults(tests, opt)
diff --git a/xdr/xdrgen.py b/xdr/xdrgen.py
index b5119cc..bed2181 100755
--- a/xdr/xdrgen.py
+++ b/xdr/xdrgen.py
@@ -1419,12 +1419,12 @@  def run(infile, filters=True, pass_attrs=True, debug=False):
 
     comment_string = "# Generated by rpcgen.py from %s on %s\n" % \
                      (infile, time.asctime())
-    const_fd = file(constants_file + ".py", "w")
+    const_fd = open(constants_file + ".py", "w")
     const_fd.write(comment_string)
-    type_fd = file(types_file + ".py", "w")
+    type_fd = open(types_file + ".py", "w")
     type_fd.write(comment_string)
     type_fd.write("import %s as const\n" % constants_file)
-    pack_fd = file(packer_file + ".py", "w")
+    pack_fd = open(packer_file + ".py", "w")
     pack_fd.write(comment_string)
     pack_fd.write(pack_header % (constants_file, types_file))
     pack_fd.write(pack_init % name_base.upper())