From 2a9a4fbdff21fe61d1155f1f7ca85ccbff334aa2 Mon Sep 17 00:00:00 2001 From: Alexey Min Date: Sun, 9 Oct 2016 13:05:39 +0500 Subject: [PATCH] service/settings: make getProxyAuthDetails() return None again --- service/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/settings.py b/service/settings.py index a1fe77572..a1607d150 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 ("", "") # never return none, return tuple with empty strings + return None if (self.serviceNetworkSettings["login"] is None) or (self.serviceNetworkSettings["password"] is None): - return ("", "") # never return none, return tuple with empty strings + return None # in all other cases, return tuple of (login, password) return (self.serviceNetworkSettings["login"], self.serviceNetworkSettings["password"])