From patchwork Tue Jul 24 07:33:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianhong Yin X-Patchwork-Id: 10541411 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 271E817FD for ; Tue, 24 Jul 2018 07:34:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C3B728759 for ; Tue, 24 Jul 2018 07:34:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00ED92875E; Tue, 24 Jul 2018 07:34:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91BC328759 for ; Tue, 24 Jul 2018 07:34:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388424AbeGXIjR (ORCPT ); Tue, 24 Jul 2018 04:39:17 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52764 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388391AbeGXIjR (ORCPT ); Tue, 24 Jul 2018 04:39:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E42C402332F; Tue, 24 Jul 2018 07:34:10 +0000 (UTC) Received: from dhcp-12-115.nay.redhat.com (unknown [10.66.12.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74107178B7; Tue, 24 Jul 2018 07:34:08 +0000 (UTC) From: jiyin@redhat.com To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org, "Jianhong.Yin" Subject: [PATCH 10/24] pynfs: python3 support plan: not equal op s/ <> / != / Date: Tue, 24 Jul 2018 15:33:28 +0800 Message-Id: <20180724073342.5738-10-jiyin@redhat.com> In-Reply-To: <20180724073342.5738-1-jiyin@redhat.com> References: <20180724073342.5738-1-jiyin@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 24 Jul 2018 07:34:10 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 24 Jul 2018 07:34:10 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jiyin@redhat.com' RCPT:'' Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Jianhong.Yin" Signed-off-by: Jianhong Yin --- nfs4.0/nfs4lib.py | 4 ++-- nfs4.0/nfs4server.py | 4 ++-- nfs4.1/nfs4client.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nfs4.0/nfs4lib.py b/nfs4.0/nfs4lib.py index dddbf91..6f6d2f9 100644 --- a/nfs4.0/nfs4lib.py +++ b/nfs4.0/nfs4lib.py @@ -227,7 +227,7 @@ class CBServer(rpc.RPCServer): cbid = cmp4args.callback_ident except XDRError: return NFS4ERR_BADXDR, [], tag - if cmp4args.minorversion <> 0: + if cmp4args.minorversion != 0: return NFS4ERR_MINOR_VERS_MISMATCH, [], tag results = [] ok = NFS4_OK @@ -239,7 +239,7 @@ class CBServer(rpc.RPCServer): resop4 = CB_ILLEGAL4res(NFS4ERR_OP_ILLEGAL) result = nfs_cb_resop4(resop=OP_ILLEGAL, opcbillegal=resop4) results += [ result ] - if ok <> NFS4_OK: + if ok != NFS4_OK: break return ok, results, tag diff --git a/nfs4.0/nfs4server.py b/nfs4.0/nfs4server.py index 18b0aad..753372e 100755 --- a/nfs4.0/nfs4server.py +++ b/nfs4.0/nfs4server.py @@ -171,7 +171,7 @@ class NFS4Server(rpc.RPCServer): return NFS4ERR_BADXDR, [], tag print("TCP NFSv4 COMPOUND call, tag: %s, n_ops: %d" % \ (repr(tag), len(cmp4args.argarray))) - if cmp4args.minorversion <> 0: + if cmp4args.minorversion != 0: return NFS4ERR_MINOR_VERS_MISMATCH, [], tag if not verify_utf8(tag): return NFS4ERR_INVAL, [], tag @@ -183,7 +183,7 @@ class NFS4Server(rpc.RPCServer): print("*** %s (%d) ***" % (opname, op.argop)) ok, result = getattr(self, opname.lower())(op) results += [ result ] - if ok <> NFS4_OK: + if ok != NFS4_OK: print(" ! error %s" % nfsstat4[ok]) break print("Replying. Status %s (%d)" % (nfsstat4[ok], ok)) diff --git a/nfs4.1/nfs4client.py b/nfs4.1/nfs4client.py index 5288942..0588d7b 100644 --- a/nfs4.1/nfs4client.py +++ b/nfs4.1/nfs4client.py @@ -177,7 +177,7 @@ class NFS4Client(rpc.Client, rpc.Server): def op_cb_compound(self, args, cred): env = CompoundState(args, cred) # Check for problems with the compound itself - if args.minorversion <> 0: + if args.minorversion != 0: if args.minorversion not in self.minor_versions: env.results.set_empty_return(NFS4ERR_MINOR_VERS_MISMATCH) return env