From 02557701f04df125027fd990d7d9df6090f1c8e8 Mon Sep 17 00:00:00 2001 From: Alexey Min Date: Sat, 1 Oct 2016 13:47:27 +0500 Subject: [PATCH] NetworkSettings: never return None in proxy auth details getter, return a tuple with empty strings instead --- service/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/settings.py b/service/settings.py index a1607d150..a1fe77572 100644 --- a/service/settings.py +++ b/service/settings.py @@ -218,9 +218,9 @@ class NetworkSettings(): def getProxyAuthDetails(self): if self.getMode() == self.PROXY_MODE_NONE: - return None + return ("", "") # never return none, return tuple with empty strings if (self.serviceNetworkSettings["login"] is None) or (self.serviceNetworkSettings["password"] is None): - return None + return ("", "") # never return none, return tuple with empty strings # in all other cases, return tuple of (login, password) return (self.serviceNetworkSettings["login"], self.serviceNetworkSettings["password"])