summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/leap/bitmask/bonafide/config.py4
-rw-r--r--src/leap/bitmask/vpn/gateways.py7
-rw-r--r--src/leap/bitmask/vpn/service.py5
3 files changed, 8 insertions, 8 deletions
diff --git a/src/leap/bitmask/bonafide/config.py b/src/leap/bitmask/bonafide/config.py
index 88795cc9..d892f472 100644
--- a/src/leap/bitmask/bonafide/config.py
+++ b/src/leap/bitmask/bonafide/config.py
@@ -446,8 +446,8 @@ class Provider(object):
return d
def check_if_invalid_config_fetch(ignored):
- # For some old versions of the webapp, it returns a 200 but downloads
- # a non-valid file. See #9004
+ # For some old versions of the webapp, it returns a 200 but
+ # downloads a non-valid file. See #9004
try:
json.loads(open(self.get_configs_path()).read())
except ValueError:
diff --git a/src/leap/bitmask/vpn/gateways.py b/src/leap/bitmask/vpn/gateways.py
index 92367c30..a7a8fb3f 100644
--- a/src/leap/bitmask/vpn/gateways.py
+++ b/src/leap/bitmask/vpn/gateways.py
@@ -36,7 +36,8 @@ class GatewaySelector(object):
# http://www.timeanddate.com/time/map/
equivalent_timezones = {13: -11, 14: -10}
- def __init__(self, gateways=None, locations=None, tz_offset=None, preferred=None):
+ def __init__(self, gateways=None, locations=None, tz_offset=None,
+ preferred=None):
'''
Constructor for GatewaySelector.
@@ -117,7 +118,7 @@ class GatewaySelector(object):
result.append((label, ip, country))
filtered = self.apply_user_preferences(result)
- return filtered
+ return filtered
def apply_user_preferences(self, options):
"""
@@ -142,7 +143,7 @@ class GatewaySelector(object):
applied.append((label, ip, country))
presorted.pop(index)
if presorted:
- applied += presorted
+ applied += presorted
return applied
def get_gateways_country_code(self):
diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py
index d2f952ef..0750a193 100644
--- a/src/leap/bitmask/vpn/service.py
+++ b/src/leap/bitmask/vpn/service.py
@@ -195,7 +195,7 @@ class VPNService(HookableService):
bonafide = self.parent.getServiceNamed("bonafide")
_providers = yield bonafide.do_provider_list()
providers = [p['domain'] for p in _providers]
- provider_dict = {}
+ provider_dict = {}
for provider in providers:
try:
config = yield bonafide.do_provider_read(provider, 'eip')
@@ -210,7 +210,6 @@ class VPNService(HookableService):
provider_dict[provider] = info
defer.returnValue(provider_dict)
-
@defer.inlineCallbacks
def _setup(self, provider):
"""Set up TunnelManager for a specified provider.
@@ -235,7 +234,7 @@ class VPNService(HookableService):
sorted_gateways = GatewaySelector(
config.gateways, config.locations,
preferred={'cc': pref_cco, 'loc': pref_loc}
- ).select_gateways()
+ ).select_gateways()
extra_flags = config.openvpn_configuration