Linux NFS development
 help / color / mirror / Atom feed
From: bryan@schmersal.org
To: calum.mackay@oracle.com
Cc: linux-nfs@vger.kernel.org, Bryan Schmersal <bryan@schmersal.org>
Subject: [PATCH pynfs] Replace references of non-existant StandardError with Exception
Date: Thu, 10 Apr 2025 14:18:17 -0700	[thread overview]
Message-ID: <20250410211816.480625-1-bryan@schmersal.org> (raw)

From: Bryan Schmersal <bryan@schmersal.org>

Signed-off-by: Bryan Schmersal <bryan@schmersal.org>
---
 nfs4.1/nfs4client.py     | 2 +-
 nfs4.1/nfs4commoncode.py | 2 +-
 nfs4.1/nfs4server.py     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nfs4.1/nfs4client.py b/nfs4.1/nfs4client.py
index ba1e087..ae90cc2 100644
--- a/nfs4.1/nfs4client.py
+++ b/nfs4.1/nfs4client.py
@@ -211,7 +211,7 @@ class NFS4Client(rpc.Client, rpc.Server):
                 except NFS4Replay:
                     # Just pass this on up
                     raise
-                except StandardError:
+                except Exception:
                     # Uh-oh.  This is a server bug
                     traceback.print_exc()
                     result = encode_status_by_name(opname.lower()[3:],
diff --git a/nfs4.1/nfs4commoncode.py b/nfs4.1/nfs4commoncode.py
index bba5a69..2d47d93 100644
--- a/nfs4.1/nfs4commoncode.py
+++ b/nfs4.1/nfs4commoncode.py
@@ -43,7 +43,7 @@ def %(encode_status)s_by_name(name, status, *args, **kwargs):
         if tag:
             result.tag = tag
         return result
-    except StandardError:
+    except Exception:
         raise
         pass
     raise RuntimeError("Problem with name %%r" %% name)
diff --git a/nfs4.1/nfs4server.py b/nfs4.1/nfs4server.py
index f56806e..d51732b 100755
--- a/nfs4.1/nfs4server.py
+++ b/nfs4.1/nfs4server.py
@@ -350,7 +350,7 @@ class ClientRecord(object):
                         state.delete()
                     # STUB - what about LAYOUT?
                     # STUB - config whether DELEG OK or not
-            except StandardError as e:
+            except Exception as e:
                 log_41.exception("Ignoring problem during state removal")
         self.state = {}
         self.lastused = time.time()
@@ -837,7 +837,7 @@ class NFS4Server(rpc.Server):
                 except NFS4Replay:
                     # Just pass this on up
                     raise
-                except StandardError:
+                except Exception:
                     # Uh-oh.  This is a server bug
                     traceback.print_exc()
                     result = encode_status_by_name(opname.lower()[3:],
-- 
2.34.1


                 reply	other threads:[~2025-04-10 21:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20250410211816.480625-1-bryan@schmersal.org \
    --to=bryan@schmersal.org \
    --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