* [PATCH] pynfs: rpc.py: use OSError.errno to fix a not subscriptable exception
@ 2024-11-28 12:36 Chen Hanxiao
2024-12-13 21:49 ` Calum Mackay
0 siblings, 1 reply; 2+ messages in thread
From: Chen Hanxiao @ 2024-11-28 12:36 UTC (permalink / raw)
To: calum.mackay; +Cc: linux-nfs
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pynfs: rpc.py: use OSError.errno to fix a not subscriptable exception
2024-11-28 12:36 [PATCH] pynfs: rpc.py: use OSError.errno to fix a not subscriptable exception Chen Hanxiao
@ 2024-12-13 21:49 ` Calum Mackay
0 siblings, 0 replies; 2+ messages in thread
From: Calum Mackay @ 2024-12-13 21:49 UTC (permalink / raw)
To: Chen Hanxiao; +Cc: Calum Mackay, linux-nfs
On 28/11/2024 12:36 pm, Chen Hanxiao wrote:
> 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>
Applied.
Thank you very much.
best wishes,
calum.
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-13 21:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-28 12:36 [PATCH] pynfs: rpc.py: use OSError.errno to fix a not subscriptable exception Chen Hanxiao
2024-12-13 21:49 ` Calum Mackay
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox