Merge pull request #132 from modoboa/fix/password_with_non_ascii

unicode_literals can be dangerous...

modoboa_webmail/lib/imaputils.py

@@ -4,8 +4,6 @@
 -------------------------------------------
 """
 
-from __future__ import unicode_literals
-
 import email
 from functools import wraps
 import imaplib
@@ -16,7 +14,7 @@
 
 import six
 
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_bytes
 from django.utils.translation import ugettext as _
 
 from modoboa.lib import imap_utf7  # noqa
@@ -270,8 +268,6 @@ def login(self, user, passwd):
         :param user: username
         :param passwd: password
         """
-        user = smart_text(user)
-        passwd = smart_text(passwd)
         try:
             if self.conf["imap_secured"]:
                 self.m = imaplib.IMAP4_SSL(self.address, self.port)
@@ -281,7 +277,7 @@ def login(self, user, passwd):
             raise ImapError(_("Connection to IMAP server failed: %s" % error))
 
         passwd = self.m._quote(passwd)
-        data = self._cmd("LOGIN", user, passwd)
+        data = self._cmd("LOGIN", smart_bytes(user), smart_bytes(passwd))
         self.m.state = "AUTH"
         if "CAPABILITY" in self.m.untagged_responses:
             self.capabilities = (