summaryrefslogtreecommitdiff
path: root/src/leap/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/config')
-rw-r--r--src/leap/config/baseconfig.py3
-rw-r--r--src/leap/config/pluggableconfig.py4
-rw-r--r--src/leap/config/prefixers.py6
-rw-r--r--src/leap/config/providerconfig.py5
4 files changed, 12 insertions, 6 deletions
diff --git a/src/leap/config/baseconfig.py b/src/leap/config/baseconfig.py
index d553255e..b80fd419 100644
--- a/src/leap/config/baseconfig.py
+++ b/src/leap/config/baseconfig.py
@@ -29,6 +29,7 @@ from abc import ABCMeta, abstractmethod
from leap.config.prefixers import get_platform_prefixer
from leap.config.pluggableconfig import PluggableConfig
+from leap.util.check import leap_assert
logger = logging.getLogger(__name__)
@@ -58,7 +59,7 @@ class BaseConfig:
@rtype: depends on the config structure, dict, str, array, int
@return: returns the value for the specified key in the config
"""
- assert self._config_checker, "Load the config first"
+ leap_assert(self._config_checker, "Load the config first")
return self._config_checker.config[key]
def get_path_prefix(self, standalone=False):
diff --git a/src/leap/config/pluggableconfig.py b/src/leap/config/pluggableconfig.py
index 64aa05cc..5ed83b3f 100644
--- a/src/leap/config/pluggableconfig.py
+++ b/src/leap/config/pluggableconfig.py
@@ -28,6 +28,8 @@ import urlparse
import jsonschema
#from leap.base.util.translations import LEAPTranslatable
+from leap.util.check import leap_assert
+
logger = logging.getLogger(__name__)
@@ -378,7 +380,7 @@ class PluggableConfig(object):
# XXX cleanup this!
if fromfile:
- assert os.path.exists(fromfile)
+ leap_assert(os.path.exists(fromfile))
if not format:
format = self.filename2format(fromfile)
diff --git a/src/leap/config/prefixers.py b/src/leap/config/prefixers.py
index a33e68aa..20d59b2d 100644
--- a/src/leap/config/prefixers.py
+++ b/src/leap/config/prefixers.py
@@ -24,6 +24,8 @@ import platform
from abc import ABCMeta, abstractmethod
from xdg import BaseDirectory
+from leap.util.check import leap_assert
+
class Prefixer:
"""
@@ -47,8 +49,8 @@ class Prefixer:
def get_platform_prefixer():
prefixer = globals()[platform.system() + "Prefixer"]
- assert prefixer, "Unimplemented platform prefixer: %s" % \
- (platform.system(),)
+ leap_assert(prefixer, "Unimplemented platform prefixer: %s" %
+ (platform.system(),))
return prefixer()
diff --git a/src/leap/config/providerconfig.py b/src/leap/config/providerconfig.py
index c3c2c298..55b33b98 100644
--- a/src/leap/config/providerconfig.py
+++ b/src/leap/config/providerconfig.py
@@ -23,6 +23,7 @@ import os
from leap.config.baseconfig import BaseConfig, LocalizedKey
from leap.config.provider_spec import leap_provider_spec
+from leap.util.check import leap_assert
logger = logging.getLogger(__name__)
@@ -95,8 +96,8 @@ class ProviderConfig(BaseConfig):
"cacert.pem")
if not about_to_download:
- assert os.path.exists(cert_path), \
- "You need to download the certificate first"
+ leap_assert(os.path.exists(cert_path),
+ "You need to download the certificate first")
logger.debug("Going to verify SSL against %s" % (cert_path,))
return cert_path