Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
From:   "NeilBrown" <neilb@suse.de>
To:     Bruce Fields <bfields@fieldses.org>,
        Jeff Layton <jlayton@kernel.org>
Cc:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: [PATCH pynfs] rpc.py: Don't try to subscript an exception.
Date:   Tue, 28 Mar 2023 11:48:57 +1100
Message-id: <167996453785.8106.14290228013263156210@noble.neil.brown.name>
Precedence: bulk


As far as I can tell python3 has never supported subscripting of
exceptions.
So don't try to...

Signed-off-by: NeilBrown <neilb@suse.de>
---
 nfs4.0/lib/rpc/rpc.py | 2 +-
 rpc/rpc.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nfs4.0/lib/rpc/rpc.py b/nfs4.0/lib/rpc/rpc.py
index 24a7fc72eff0..585db3551f73 100644
--- a/nfs4.0/lib/rpc/rpc.py
+++ b/nfs4.0/lib/rpc/rpc.py
@@ -227,7 +227,7 @@ class RPCClient(object):
                 sock.bind(('', port))
                 return
             except socket.error as why:
-                if why[0] == errno.EADDRINUSE:
+                if why.errno == errno.EADDRINUSE:
                     port += 1
                 else:
                     print("Could not use low port")
diff --git a/rpc/rpc.py b/rpc/rpc.py
index 1fe285aa2b5b..814de4e08bc9 100644
--- a/rpc/rpc.py
+++ b/rpc/rpc.py
@@ -846,7 +846,7 @@ class ConnectionHandler(object):
                 s.bind(('', using))
                 return
             except socket.error as why:
-                if why[0] == errno.EADDRINUSE:
+                if why.errno == errno.EADDRINUSE:
                     using += 1
                     if port < 1024 <= using:
                         # If we ask for a secure port, make sure we don't
-- 
2.40.0