From a38e61691a79b20199cdedf23f60a5760bba7a06 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 21 Sep 2012 06:44:19 +0900
Subject: add property to baseconfig

config instead of get_config()
---
 src/leap/base/config.py | 10 +++-------
 src/leap/eip/checks.py  |  8 ++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/leap/base/config.py b/src/leap/base/config.py
index 76fbee3c..79185976 100644
--- a/src/leap/base/config.py
+++ b/src/leap/base/config.py
@@ -38,13 +38,9 @@ class BaseLeapConfig(object):
     def get_config(self, *kwargs):
         raise NotImplementedError("abstract base class")
 
-    #XXX todo: enable this property after
-    #fixing name clash with "config" in use at
-    #vpnconnection
-
-    #@property
-    #def config(self):
-        #return self.get_config()
+    @property
+    def config(self):
+        return self.get_config()
 
     def get_value(self, *kwargs):
         raise NotImplementedError("abstract base class")
diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py
index ef09a582..5ace1479 100644
--- a/src/leap/eip/checks.py
+++ b/src/leap/eip/checks.py
@@ -388,7 +388,7 @@ class EIPConfigChecker(object):
         This is catched by ui and runs FirstRunWizard (MVS+)
         """
         if config is None:
-            config = self.eipconfig.get_config()
+            config = self.eipconfig.config
         logger.debug('checking default provider')
         provider = config.get('provider', None)
         if provider is None:
@@ -412,7 +412,7 @@ class EIPConfigChecker(object):
             logger.debug('(fetching def skipped)')
             return True
         if config is None:
-            config = self.defaultprovider.get_config()
+            config = self.defaultprovider.config
         if uri is None:
             domain = config.get('provider', None)
             uri = self._get_provider_definition_uri(domain=domain)
@@ -429,7 +429,7 @@ class EIPConfigChecker(object):
         if skip_download:
             return True
         if config is None:
-            config = self.eipserviceconfig.get_config()
+            config = self.eipserviceconfig.config
         if uri is None:
             domain = config.get('provider', None)
             uri = self._get_eip_service_uri(domain=domain)
@@ -440,7 +440,7 @@ class EIPConfigChecker(object):
     def check_complete_eip_config(self, config=None):
         # TODO check for gateway
         if config is None:
-            config = self.eipconfig.get_config()
+            config = self.eipconfig.config
         try:
             'trying assertions'
             assert 'provider' in config
-- 
cgit v1.2.3