From 6e12ee1b85c861ea9ed8edabee2f351a76a148c1 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Mon, 24 Apr 2023 11:08:09 +0200 Subject: Wrappers Python: Get rid of optional as return If an error is non-nil, the data is guaranteed to contain a value For discovery we do not explicitly forward errors (TODO, log in the wrapper?). However, when building in release mode, we have embedded disco so even if we get an error we should have guaranteed that it contains a value --- wrappers/python/eduvpn_common/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wrappers/python/eduvpn_common') diff --git a/wrappers/python/eduvpn_common/main.py b/wrappers/python/eduvpn_common/main.py index 5d08ba9..5608562 100644 --- a/wrappers/python/eduvpn_common/main.py +++ b/wrappers/python/eduvpn_common/main.py @@ -134,29 +134,29 @@ class EduVPN(object): if add_err: forwardError(add_err) - def get_expiry_times(self) -> Optional[str]: + def get_expiry_times(self) -> str: expiry, expiry_err = self.go_function(self.lib.ExpiryTimes) if expiry_err: forwardError(expiry_err) return expiry - def get_current_server(self) -> Optional[str]: + def get_current_server(self) -> str: server, server_err = self.go_function(self.lib.CurrentServer) if server_err: forwardError(server_err) return server - def get_disco_organizations(self) -> Optional[str]: + def get_disco_organizations(self) -> str: orgs, _ = self.go_cookie_function(self.lib.DiscoOrganizations) # TODO: Log error return orgs - def get_disco_servers(self) -> Optional[str]: + def get_disco_servers(self) -> str: servers, _ = self.go_cookie_function(self.lib.DiscoServers) # TODO: Log error return servers - def get_servers(self) -> Optional[str]: + def get_servers(self) -> str: servers, servers_err = self.go_function(self.lib.ServerList) if servers_err: forwardError(servers_err) @@ -177,7 +177,7 @@ class EduVPN(object): def get_config( self, _type: ServerType, identifier: str, prefer_tcp: bool = False - ) -> Optional[str]: + ) -> str: """Get an OpenVPN/WireGuard configuration from the server :param _type: ServerType: The type of server e.g. SERVER.INSTITUTE_ACCESS -- cgit v1.2.3