From 751638b4eb8208e1eaa1beaaed284da6b412bca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Thu, 7 Mar 2013 19:05:11 -0300
Subject: Change asserts for a custom leap_assert method

Also:
- Make SRPAuth and the Bootstrappers be a QObject instead of a QThread
  so we can use them inside another more generic thread
- Add a generic CheckerThread that runs checks or whatever operation
  as long as it returns a boolean value
- Closes the whole application if the wizard is rejected at the first
  run
- Do not fail when the config directory doesn't exist
- Set the wizard pixmap logo as LEAP's logo
- Improve wizard checks
- Make SRPRegister play nice with the CheckerThread
---
 src/leap/config/baseconfig.py      | 3 ++-
 src/leap/config/pluggableconfig.py | 4 +++-
 src/leap/config/prefixers.py       | 6 ++++--
 src/leap/config/providerconfig.py  | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/leap/config')

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
-- 
cgit v1.2.3