summaryrefslogtreecommitdiff
path: root/wrappers/python/src/__init__.py
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-09-21 11:37:32 +0200
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-09-21 11:37:32 +0200
commit448c51d2142c186f0490b9d51c0d73beb3c76863 (patch)
tree4553269be84b58072a11645221649bcccd85c73f /wrappers/python/src/__init__.py
parent7dbc3bbe2ca65fb7ec200ab7aa713855b0bdc11d (diff)
Exports + Python: Do not panic on error for getting disco + servers
Diffstat (limited to 'wrappers/python/src/__init__.py')
-rw-r--r--wrappers/python/src/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/wrappers/python/src/__init__.py b/wrappers/python/src/__init__.py
index ca07143..3bafc0e 100644
--- a/wrappers/python/src/__init__.py
+++ b/wrappers/python/src/__init__.py
@@ -169,8 +169,8 @@ lib.Register.argtypes, lib.Register.restype = [
], c_void_p
lib.GetDiscoOrganizations.argtypes, lib.GetDiscoOrganizations.restype = [
c_char_p
-], c_void_p
-lib.GetDiscoServers.argtypes, lib.GetDiscoServers.restype = [c_char_p], c_void_p
+], DataError
+lib.GetDiscoServers.argtypes, lib.GetDiscoServers.restype = [c_char_p], DataError
lib.GoBack.argtypes, lib.GoBack.restype = [c_char_p], None
lib.CancelOAuth.argtypes, lib.CancelOAuth.restype = [c_char_p], c_void_p
lib.SetProfileID.argtypes, lib.SetProfileID.restype = [c_char_p, c_char_p], c_void_p
@@ -198,7 +198,7 @@ lib.FreeDiscoServers.argtypes, lib.FreeDiscoServers.restype = [c_void_p], None
lib.FreeServer.argtypes, lib.FreeServer.restype = [c_void_p], None
lib.FreeServers.argtypes, lib.FreeServers.restype = [c_void_p], None
lib.InFSMState.argtypes, lib.InFSMState.restype = [c_void_p, c_int], int
-lib.GetSavedServers.argtypes, lib.GetSavedServers.restype = [c_char_p], c_void_p
+lib.GetSavedServers.argtypes, lib.GetSavedServers.restype = [c_char_p], DataError
class WrappedError:
@@ -269,8 +269,8 @@ def get_error(ptr: c_void_p) -> str:
return error.cause
-def get_data_error(data_error: DataError) -> Tuple[str, str]:
- data = get_ptr_string(data_error.data)
+def get_data_error(data_error: DataError, data_conv=get_ptr_string) -> Tuple[str, str]:
+ data = data_conv(data_error.data)
error = get_error(data_error.error)
return data, error