diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-06-28 13:18:15 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-06-28 13:18:15 -0300 |
commit | 4785877270da1702aa3a4a170a62baa494eb35fa (patch) | |
tree | 3109f1edc3a3648b37f9ccd93f9eb9e3db16e6a8 /src/leap/config/providerconfig.py | |
parent | 90c4d00b63edb379e5b0101ad870b528328247b1 (diff) | |
parent | 32b6afae6eb66cd75608b26aecd86bbfc587736e (diff) |
Merge remote-tracking branch 'ivan/bug/3032_supported-services-fix' into develop
Diffstat (limited to 'src/leap/config/providerconfig.py')
-rw-r--r-- | src/leap/config/providerconfig.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/leap/config/providerconfig.py b/src/leap/config/providerconfig.py index 94568c27..8b72153a 100644 --- a/src/leap/config/providerconfig.py +++ b/src/leap/config/providerconfig.py @@ -24,7 +24,6 @@ import os from leap.common.check import leap_assert from leap.common.config.baseconfig import BaseConfig, LocalizedKey from leap.config.provider_spec import leap_provider_spec -from leap.services import get_available logger = logging.getLogger(__name__) @@ -81,17 +80,16 @@ class ProviderConfig(BaseConfig): def get_services(self): """ - Returns a list with the services supported by the - current provider. + Returns a list with the available services in the current provider. :rtype: list """ - services = get_available(self._safe_get_value("services")) + services = self._safe_get_value("services") return services def get_services_string(self): """ - Returns a string with the services supported by the current + Returns a string with the available services in the current provider, ready to be shown to the user. """ services_str = ", ".join(self.get_services()) |