Request 3215 (accepted)

This request supersedes: request 3208 (Show diff)

Overview

Request 3215 (accepted)

New release 0.9.0.3

Created by mollekopf 9 months ago
In state accepted
Supersedes 3208
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit pykolab-python3

Submit package Kolab:16:Testing / pykolab-python3 to package Kolab:16 / pykolab-python3

pykolab.spec Changed

debian.changelog Changed

pykolab-0.9.0.tar.gz/pykolab/xml/contact.py Changed

pykolab-0.9.0.tar.gz/pykolab/xml/event.py Changed

pykolab-0.9.0.tar.gz/pykolab/xml/note.py Changed

pykolab-0.9.0.tar.gz/pykolab/xml/todo.py Changed

pykolab-0.9.0.tar.gz/wallace/module_gpgencrypt.py Changed

pykolab-0.9.0.tar.gz/wallace/module_invitationpolicy.py Changed

@@ -34,7 +34,7 @@
 import traceback
 import re
 
-from email import message_from_string
+from email import message_from_bytes
 from email.parser import Parser
 from email.utils import formataddr
 from email.utils import getaddresses
@@ -858,33 +858,25 @@
             if len(_ns for _ns in ns_shared if folder.startswith(_ns)) > 0:
                 continue
 
-        key = ('/shared' + FOLDER_TYPE_ANNOTATION).encode('utf-8')
-        if key in metadata:
-            if metadatakey.startswith(_type):
-                result.append(folder)
-
         key = ('/private' + FOLDER_TYPE_ANNOTATION).encode('utf-8')
-        if key in metadata:
-            if metadatakey.startswith(_type):
-                result.append(folder)
-
-            # store default folder in user record
+        if key in metadata and metadatakey.startswith(_type):
+            # store default,private and confidential folders in user record
             if metadatakey.endswith(b'.default'):
-                user_rec'_default_folder' = folder
-                continue
-
-            # store private and confidential folders in user record
-            if metadatakey.endswith(b'.confidential'):
+                if '_default_folder' not in user_rec:
+                    user_rec'_default_folder' = folder
+            elif metadatakey.endswith(b'.confidential'):
                 if '_confidential_folder' not in user_rec:
                     user_rec'_confidential_folder' = folder
-
-                continue
-
-            if metadatakey.endswith(b'.private'):
+            elif metadatakey.endswith(b'.private'):
                 if '_private_folder' not in user_rec:
                     user_rec'_private_folder' = folder
 
-                continue
+            result.append(folder)
+            continue
+
+        key = ('/shared' + FOLDER_TYPE_ANNOTATION).encode('utf-8')
+        if key in metadata and metadatakey.startswith(_type):
+            result.append(folder)
 
     # cache with user record
     user_rec'_imap_folders' = result
@@ -915,16 +907,16 @@
             res, data = imap.imap.m.fetch(num, '(UID RFC822)')
 
             try:
-                msguid = re.search(r"\WUID (\d+)", data00).group(1)
+                msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)
             except Exception:
                 log.error(_("No UID found in IMAP response: %r") % (data00))
                 continue
 
             try:
                 if type == 'task':
-                    event = todo_from_message(message_from_string(data01))
+                    event = todo_from_message(message_from_bytes(data01))
                 else:
-                    event = event_from_message(message_from_string(data01))
+                    event = event_from_message(message_from_bytes(data01))
 
                 # find instance in a recurring series
                 if recurrence_id and (event.is_recurring() or event.has_exceptions() or event.get_recurrence_id()):
@@ -982,7 +974,7 @@
             res, data = imap.imap.m.fetch(num, '(RFC822)')
 
             try:
-                event = event_from_message(message_from_string(data01))
+                event = event_from_message(message_from_bytes(data01))
             except Exception as errmsg:
                 log.error(_("Failed to parse event from message %s/%s: %r") % (folder, num, errmsg))
                 continue
@@ -1056,7 +1048,7 @@
 
 
 def get_lock_key(user, uid):
-    return hashlib.md5("%s/%s" % (user'mail', uid)).hexdigest()
+    return hashlib.md5(("%s/%s" % (user'mail', uid)).encode('utf-8')).hexdigest()
 
 
 def update_object(object, user_rec, master=None):

pykolab-0.9.0.tar.gz/wallace/module_resources.py Changed

@@ -22,7 +22,7 @@
 import datetime
 import sys
 
-from email import message_from_string
+from email import message_from_bytes
 from email.parser import Parser
 from email.utils import formataddr
 from email.utils import getaddresses
@@ -665,7 +665,7 @@
         typ, data = imap.imap.m.fetch(num, '(RFC822)')
 
         try:
-            event = event_from_message(message_from_string(data01))
+            event = event_from_message(message_from_bytes(data01))
         # pylint: disable=broad-except
         except Exception as errmsg:
             log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, errmsg))
@@ -915,14 +915,14 @@
         typ, data = imap.imap.m.fetch(num, '(UID RFC822)')
 
         try:
-            msguid = re.search(r"\WUID (\d+)", data00).group(1)
+            msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)
         # pylint: disable=broad-except
         except Exception:
             log.error(_("No UID found in IMAP response: %r") % (data00))
             continue
 
         try:
-            event = event_from_message(message_from_string(data01))
+            event = event_from_message(message_from_bytes(data01))
         # pylint: disable=broad-except
         except Exception as e:
             log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, e))
@@ -977,14 +977,14 @@
         typ, data = imap.imap.m.fetch(num, '(UID RFC822)')
 
         try:
-            msguid = re.search(r"\WUID (\d+)", data00).group(1)
+            msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)
         # pylint: disable=broad-except
         except Exception:
             log.error(_("No UID found in IMAP response: %r") % (data00))
             continue
 
         try:
-            event = event_from_message(message_from_string(data01))
+            event = event_from_message(message_from_bytes(data01))
 
             # find instance in a recurring series
             if recurrence_id and (event.is_recurring() or event.has_exceptions()):

pykolab-0.9.0.tar.gz/wallace/modules.py Changed

pykolab.dsc Changed

release.sh Added

Build Results
RPM Lint

Refresh

Comments for request 3215 0

Request History

mollekopf created request 9 months ago

New release 0.9.0.3

mollekopf accepted request 9 months ago