Request 3044 (accepted)

Overview

Request 3044 (accepted)

Python3 support

Created by mollekopf over 2 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit pykolab-python3

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

pykolab-0.9.0.tar.gz/conf/kolab.conf Changed

pykolab-0.9.0.tar.gz/cyruslib.py Changed

@@ -36,6 +36,7 @@
 try:
     import imaplib
     import re
+    import six
     from binascii import b2a_base64
 except ImportError as e:
     print(e)
@@ -62,6 +63,31 @@
 re_mb  = re.compile(r'$(.*)$\s\".\"\s(.*)')
 re_url = re.compile(r'^(imaps?)://(.+?):?(\d{0,5})$')
 
+def ensure_str(s, encoding='utf-8', errors='strict'):
+    """Coerce *s* to `str`.
+    For Python 2:
+      - `unicode` -> encoded to `str`
+      - `str` -> `str`
+    For Python 3:
+      - `str` -> `str`
+      - `bytes` -> decoded to `str`
+
+      Copied from six (not available < 1.12)
+    """
+    # Optimization: Fast return for the common case.
+    if type(s) is str:
+        return s
+    if isinstance(s, list):
+        #FIXME pass encoding
+        return list(map(ensure_str, s))
+    if six.PY2 and isinstance(s, six.text_type):
+        return s.encode(encoding, errors)
+    elif six.PY3 and isinstance(s, six.binary_type):
+        return s.decode(encoding, errors)
+    elif not isinstance(s, (six.text_type, six.binary_type)):
+        raise TypeError("not expecting type '%s'" % type(s))
+    return s
+
 def ok(res):
     return res.upper().startswith('OK')
 
@@ -511,7 +537,7 @@
 
     def decode(self, text):
         if self.ENCODING == 'imap':
-            return text
+            return quote(ensure_str(text))
         elif self.ENCODING in self.ENCODING_LIST:
             return self.__decode(text)
 
@@ -591,7 +617,7 @@
         self.__prepare('GETACL', mailbox)
         res, acl = self.__docommand("getacl", self.decode(mailbox))
         acls = {}
-        aclList = splitquote(acl.pop().strip())
+        aclList = splitquote(ensure_str(acl.pop().strip()))
         del aclList0 # mailbox
         for i in range(0, len(aclList), 2):
             try:

pykolab-0.9.0.tar.gz/pykolab/auth/ldap/__init__.py Changed

Build Results
RPM Lint

Refresh

Comments for request 3044 0

Request History

mollekopf created request over 2 years ago

Python3 support

mollekopf accepted request over 2 years ago