From: Bryan Schmersal <bryan@xxxxxxxxxxxxx>
Signed-off-by: Bryan Schmersal <bryan@xxxxxxxxxxxxx>
---
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
