Branch 'pykolab-0.5' - 2 commits - cyruslib.py

[Jeroen van Meeuwen]

 cyruslib.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 93e28ab95f665c0e484de306b10bd9b11099b387
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 22 13:28:46 2013 +0200

    Remove erroneous print statement

diff --git a/cyruslib.py b/cyruslib.py
index c8a8d4f..5f0044c 100644
--- a/cyruslib.py
+++ b/cyruslib.py
@@ -672,9 +672,6 @@ class CYRUS:
                     continue
 
         for annotation in annotations:
-
-            print annotation
-
             folder = annotation.split('"')[1].replace('"','')
 
             if not ann.has_key(folder):


commit ad600c78ea858f600055dd24cece64a3440e0dea
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 22 13:27:06 2013 +0200

    Correct parsing folder names with spaces (#1887)

diff --git a/cyruslib.py b/cyruslib.py
index 27ce418..c8a8d4f 100644
--- a/cyruslib.py
+++ b/cyruslib.py
@@ -673,12 +673,14 @@ class CYRUS:
 
         for annotation in annotations:
 
-            folder = annotation.split()[0].replace('"','')
+            print annotation
+
+            folder = annotation.split('"')[1].replace('"','')
 
             if not ann.has_key(folder):
                 ann[folder] = {}
 
-            key = annotation.split()[1].replace('"','').replace("'","")
+            key = annotation.split('"')[3].replace('"','').replace("'","")
 
             _annot = annotation.split('(')[1].split(')')[0]