From: Chen Hanxiao <chenhx.fnst@fujitsu.com>
To: calum.mackay@oracle.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH] pynfs: rpc.py: use OSError.errno to fix a not subscriptable exception
Date: Thu, 28 Nov 2024 20:36:01 +0800 [thread overview]
Message-ID: <20241128123642.1636-1-chenhx.fnst@fujitsu.com> (raw)
In python3, socket.error is a deprecated alias of OSError
https://docs.python.org/3/library/socket.html#socket.error
Also, use socket.error[0] will raise:
TypeError: 'OSError' object is not subscriptable
Signed-off-by: Chen Hanxiao <chenhx.fnst@fujitsu.com>
---
nfs4.0/lib/rpc/rpc.py | 4 ++--
rpc/rpc.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nfs4.0/lib/rpc/rpc.py b/nfs4.0/lib/rpc/rpc.py
index 24a7fc7..243ef9e 100644
--- a/nfs4.0/lib/rpc/rpc.py
+++ b/nfs4.0/lib/rpc/rpc.py
@@ -226,8 +226,8 @@ class RPCClient(object):
try:
sock.bind(('', port))
return
- except socket.error as why:
- if why[0] == errno.EADDRINUSE:
+ except OSError as why:
+ 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 1fe285a..124e97a 100644
--- a/rpc/rpc.py
+++ b/rpc/rpc.py
@@ -845,8 +845,8 @@ class ConnectionHandler(object):
try:
s.bind(('', using))
return
- except socket.error as why:
- if why[0] == errno.EADDRINUSE:
+ except OSError as why:
+ if why.errno == errno.EADDRINUSE:
using += 1
if port < 1024 <= using:
# If we ask for a secure port, make sure we don't
--
2.43.5
next reply other threads:[~2024-11-28 12:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-28 12:36 Chen Hanxiao [this message]
2024-12-13 21:49 ` [PATCH] pynfs: rpc.py: use OSError.errno to fix a not subscriptable exception Calum Mackay
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=20241128123642.1636-1-chenhx.fnst@fujitsu.com \
--to=chenhx.fnst@fujitsu.com \
--cc=calum.mackay@oracle.com \
--cc=linux-nfs@vger.kernel.org \
/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