linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: jiyin@redhat.com
To: bfields@redhat.com
Cc: linux-nfs@vger.kernel.org, "Jianhong.Yin" <yin-jianhong@163.com>
Subject: [PATCH 12/24] pynfs: python3 support plan: file() -> open()
Date: Tue, 24 Jul 2018 15:33:30 +0800	[thread overview]
Message-ID: <20180724073342.5738-12-jiyin@redhat.com> (raw)
In-Reply-To: <20180724073342.5738-1-jiyin@redhat.com>

From: "Jianhong.Yin" <yin-jianhong@163.com>

Signed-off-by: Jianhong Yin <yin-jianhong@163.com>
---
 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(-)

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())
-- 
2.17.1


  parent reply	other threads:[~2018-07-24  8:39 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-24  7:33 [PATCH 01/24] pynfs: python3 support plan: print -> print() jiyin
2018-07-24  7:33 ` [PATCH 02/24] pynfs: python3 support plan: exec -> exec() jiyin
2018-07-24  7:33 ` [PATCH 03/24] pynfs: python3 support plan: "except E,e:" -> "except E as e:" jiyin
2018-07-24  7:33 ` [PATCH 04/24] pynfs: python3 support plan: "raise E, args:" -> "raise E(args)" jiyin
2018-07-24  7:33 ` [PATCH 05/24] pynfs: python3 support plan: remove suffix 'L' of long integer jiyin
2018-07-24  7:33 ` [PATCH 06/24] pynfs: python3 support plan: octal literal 0644 -> 0o644 jiyin
2018-07-24  7:33 ` [PATCH 07/24] pynfs: python3 support plan: sys.maxint -> sys.maxsize jiyin
2018-07-24  7:33 ` [PATCH 08/24] pynfs: python3 support plan: cStringIO -> StringIO jiyin
2018-07-24  7:33 ` [PATCH 09/24] pynfs: python3 support plan: dict.has_key -> key in dict jiyin
2018-07-24  7:33 ` [PATCH 10/24] pynfs: python3 support plan: not equal op s/ <> / != / jiyin
2018-07-24  7:33 ` [PATCH 11/24] pynfs: python3 support plan: xdrgen: remove 'L' suffix of long integer jiyin
2018-07-24  7:33 ` jiyin [this message]
2018-07-24  7:33 ` [PATCH 13/24] pynfs: python3 support plan: list.sort() -> newlist = sorted(list) jiyin
2018-07-24  7:33 ` [PATCH 14/24] pynfs: python3 support plan: Relative Import -> Absolute Import jiyin
2018-07-24  7:33 ` [PATCH 15/24] pynfs: python3 support plan: fix 'socket' has no attribute '_socketobject' jiyin
2018-07-24  7:33 ` [PATCH 16/24] pynfs: python3 support plan: remove cPickle jiyin
2018-07-24  7:33 ` [PATCH 17/24] pynfs: python3 support plan: fix indent error on python3 jiyin
2018-07-24  7:33 ` [PATCH 18/24] pynfs: python3 support plan: fix 'TypeError: must be str, not bytes' jiyin
2018-07-24  7:33 ` [PATCH 19/24] pynfs: python3 support plan: fix import fail on python3 jiyin
2018-07-24  7:33 ` [PATCH 20/24] pynfs: python3 support plan: fix 'dict' has no attribute 'iteritems' jiyin
2018-07-24  7:33 ` [PATCH 21/24] pynfs: python3 support plan: fix sort() fail and require python version jiyin
2018-07-24  7:33 ` [PATCH 22/24] pynfs: python3 support plan: fix ord() failure on python3 jiyin
2018-07-24  7:33 ` [PATCH 23/24] pynfs: python3 support plan: fix except multi exceptions in one line jiyin
2018-07-24  7:33 ` [PATCH 24/24] pynfs: python3 support plan: fix access class var in list comprehension jiyin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180724073342.5738-12-jiyin@redhat.com \
    --to=jiyin@redhat.com \
    --cc=bfields@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=yin-jianhong@163.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).