From 0f5ae9a05b71545f34acde15f50536ff80da4ac0 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Mon, 14 Feb 2022 14:11:29 +0100 Subject: Python: Simplify error class Signed-off-by: jwijenbergh --- wrappers/python/eduvpncommon/discovery.py | 2 ++ wrappers/python/eduvpncommon/error.py | 9 +++------ 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] -- cgit v1.2.3