Return-Path: Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54704 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388421AbeGXIjW (ORCPT ); Tue, 24 Jul 2018 04:39:22 -0400 From: jiyin@redhat.com To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org, "Jianhong.Yin" Subject: [PATCH 12/24] pynfs: python3 support plan: file() -> open() Date: Tue, 24 Jul 2018 15:33:30 +0800 Message-Id: <20180724073342.5738-12-jiyin@redhat.com> In-Reply-To: <20180724073342.5738-1-jiyin@redhat.com> References: <20180724073342.5738-1-jiyin@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: "Jianhong.Yin" Signed-off-by: Jianhong Yin --- 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