summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/config
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-01-23 17:07:02 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-01-23 17:09:43 -0300
commitd4e53f6cef9ba2b476cc8308f132d8af20e79156 (patch)
tree22976e7b07816140ecfd05855e201ff104937ac6 /src/leap/bitmask/config
parent2cb7443595a91857a4d037f2385ade5c8385d6a4 (diff)
Replace provider hardcoded path with helper.
Also reorder some imports and remove unused ones.
Diffstat (limited to 'src/leap/bitmask/config')
-rw-r--r--src/leap/bitmask/config/providerconfig.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index e80b2337..2ebe05ce 100644
--- a/src/leap/bitmask/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
@@ -21,11 +21,12 @@ Provider configuration
import logging
import os
-from leap.common.check import leap_check
-from leap.common.config.baseconfig import BaseConfig, LocalizedKey
+from leap.bitmask import provider
from leap.bitmask.config.provider_spec import leap_provider_spec
from leap.bitmask.services import get_service_display_name
from leap.bitmask.util import get_path_prefix
+from leap.common.check import leap_check
+from leap.common.config.baseconfig import BaseConfig, LocalizedKey
logger = logging.getLogger(__name__)
@@ -55,10 +56,7 @@ class ProviderConfig(BaseConfig):
:rtype: ProviderConfig or None if there is a problem loading the config
"""
provider_config = ProviderConfig()
- provider_config_path = os.path.join(
- "leap", "providers", domain, "provider.json")
-
- if not provider_config.load(provider_config_path):
+ if not provider_config.load(provider.get_provider_path(domain)):
provider_config = None
return provider_config