Branch 'dev/entitlements' - pykolab/conf

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed Jan 4 12:30:20 CET 2012


 pykolab/conf/__init__.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 6570fb06a787f3b3bf59d40e412105c0a9f4eedc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jan 4 12:29:49 2012 +0100

    Don't forget to try/except importing the Entitlements class, and then only fail afterwards

diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py
index b078162..69d592e 100644
--- a/pykolab/conf/__init__.py
+++ b/pykolab/conf/__init__.py
@@ -48,14 +48,15 @@ class Conf(object):
 
         self.entitlement = None
 
-        from pykolab.conf.entitlement import Entitlement
-        self.entitlement = Entitlement().get()
-
-        #try:
-            #from pykolab.conf.entitlement import Entitlement
-            #self.entitlement = Entitlement().get()
-        #except:
-            #pass
+        try:
+            from pykolab.conf.entitlement import Entitlement
+            entitlements = True
+        except:
+            entitlements = False
+            pass
+
+        if entitlements:
+            self.entitlement = Entitlement().get()
 
         self.plugins = None
 





More information about the commits mailing list