2 commits - pykolab/conf pykolab/wap_client

[Jeroen van Meeuwen]

 pykolab/conf/__init__.py       |    2 +-
 pykolab/wap_client/__init__.py |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit e5a626744419ff4942785d4158373f4f6cadde3a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 24 16:46:15 2013 +0200

    Correct group_add() and add group_delete()

diff --git a/pykolab/wap_client/__init__.py b/pykolab/wap_client/__init__.py
index 5daa61c..9274be3 100644
--- a/pykolab/wap_client/__init__.py
+++ b/pykolab/wap_client/__init__.py
@@ -246,9 +246,19 @@ def group_add(params=None):
     if params == None:
         params = get_group_input()
 
-    params = json.dumps(params)
+    post = json.dumps(params)
+
+    return request('POST', 'group.add', post=post)
+
+def group_delete(params=None):
+    if params == None:
+        params = {
+                'id': utils.ask_question("Name of group to delete", "group")
+            }
+
+    post = json.dumps(params)
 
-    return request('POST', 'group.add', params)
+    return request('POST', 'group.delete', post=post)
 
 def group_form_value_generate_mail(params=None):
     if params == None:


commit 1c5fc23018afe494306950b4ade33cf068b4d62e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 24 13:32:04 2013 +0200

    Fix indentation

diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py
index 690152a..1576d84 100644
--- a/pykolab/conf/__init__.py
+++ b/pykolab/conf/__init__.py
@@ -182,7 +182,7 @@ class Conf(object):
             return
 
         for key in config.options('testing'):
-	    retval = False
+            retval = False
 
             if isinstance(self.defaults.__dict__['testing'][key], int):
                 value = config.getint('testing',key)