summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-02-14 14:11:29 +0100
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-04-05 12:26:12 +0200
commit0f5ae9a05b71545f34acde15f50536ff80da4ac0 (patch)
tree280b607a4e991327a6ad4c29863cd5e38b83bb28
parent943fd5723cb4fd9a916b8baa6858c5895e8172cb (diff)
Python: Simplify error class
Signed-off-by: jwijenbergh <jeroenwijenbergh@protonmail.com>
-rw-r--r--wrappers/python/eduvpncommon/discovery.py2
-rw-r--r--wrappers/python/eduvpncommon/error.py9
2 files changed, 5 insertions, 6 deletions
diff --git a/wrappers/python/eduvpncommon/discovery.py b/wrappers/python/eduvpncommon/discovery.py
index b30368b..154d007 100644
--- a/wrappers/python/eduvpncommon/discovery.py
+++ b/wrappers/python/eduvpncommon/discovery.py
@@ -43,6 +43,7 @@ class RequestError(GoError):
{
RequestErrorCode.ErrRequestFileError: "file request error",
RequestErrorCode.ErrVerifySigError: "signature verify error",
+ RequestErrorCode.Unknown: "unknown error",
})
@@ -61,6 +62,7 @@ class VerifyError(GoError):
VerifyErrorCode.ErrInvalidSignature: "invalid signature",
VerifyErrorCode.ErrInvalidSignatureUnknownKey: "invalid signature (unknown key)",
VerifyErrorCode.ErrTooOld: "replay of previous signature (rollback)",
+ VerifyErrorCode.Unknown: "unknown error",
})
diff --git a/wrappers/python/eduvpncommon/error.py b/wrappers/python/eduvpncommon/error.py
index 2ec82e7..ce0cec1 100644
--- a/wrappers/python/eduvpncommon/error.py
+++ b/wrappers/python/eduvpncommon/error.py
@@ -2,15 +2,12 @@ from enum import Enum
class GoError(Exception):
message_dict: dict
- code: Enum | None
+ code: Enum
def __init__(self, err: Enum, messages: dict):
assert err
- try:
- self.code = err
- except ValueError:
- self.code = None
+ self.code = err
self.message_dict = messages
def __str__(self):
- return self.message_dict[self.code] if self.code in self.message_dict else f"unknown error ({self.code})"
+ return self.message_dict[self.code]