From c97e5a703d0162d7ab53e249b9148abe65083ec5 Mon Sep 17 00:00:00 2001
From: Arthur Vuillard <arthur@hashbang.fr>
Date: Thu, 11 May 2017 15:17:20 +0200
Subject: [PATCH] fix tests for modoboa.core in python2

---
 modoboa/admin/forms/import_.py   | 2 +-
 modoboa/core/tests/test_views.py | 6 ++----
 modoboa/lib/ldap_utils.py        | 5 +++--
 modoboa/lib/tests.py             | 2 --
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modoboa/admin/forms/import_.py b/modoboa/admin/forms/import_.py
index 19fc7d360..790260919 100644
--- a/modoboa/admin/forms/import_.py
+++ b/modoboa/admin/forms/import_.py
@@ -29,7 +29,7 @@ class ImportDataForm(forms.Form):
     def clean_sepchar(self):
         if self.cleaned_data["sepchar"] == "":
             return ";"
-        return str(self.cleaned_data["sepchar"])
+        return self.cleaned_data["sepchar"]
 
 
 class ImportIdentitiesForm(ImportDataForm):
diff --git a/modoboa/core/tests/test_views.py b/modoboa/core/tests/test_views.py
index 904754fc3..177ca940d 100644
--- a/modoboa/core/tests/test_views.py
+++ b/modoboa/core/tests/test_views.py
@@ -2,8 +2,6 @@
 
 from __future__ import unicode_literals
 
-import json
-
 from testfixtures import compare
 
 from django import forms
@@ -53,12 +51,12 @@ class DashboardTestCase(ModoTestCase):
         url = reverse("core:dashboard")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertIn("Latest news", str(response.content))
+        self.assertIn("Latest news", response.content.decode('utf-8'))
         self.client.logout()
         self.client.login(username=self.dadmin.username, password="toto")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertIn("Latest news", str(response.content))
+        self.assertIn("Latest news", response.content.decode('utf-8'))
         self.client.logout()
         self.client.login(username=self.user.username, password="toto")
         response = self.client.get(url)
diff --git a/modoboa/lib/ldap_utils.py b/modoboa/lib/ldap_utils.py
index 26d29fb65..6ec1316fe 100644
--- a/modoboa/lib/ldap_utils.py
+++ b/modoboa/lib/ldap_utils.py
@@ -39,6 +39,7 @@ import ldap
 
 from django.conf import settings
 from django.utils.translation import ugettext as _
+from django.utils.encoding import smart_bytes
 
 from modoboa.core.password_hashers import get_password_hasher
 from modoboa.lib.exceptions import InternalError
@@ -119,8 +120,8 @@ class LDAPAuthBackend(object):
                 ('"%s"' % newpassword).encode('utf-16').lstrip('\377\376')
             )
         ldif = [(ldap.MOD_REPLACE,
-                 self.pwd_attr,
-                 self._crypt_password(newpassword))]
+                 smart_bytes(self.pwd_attr),
+                 smart_bytes(self._crypt_password(newpassword)))]
         try:
             self.conn.modify_s(user_dn, ldif)
         except ldap.LDAPError as e:
diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py
index 7cb122345..e86d6a405 100644
--- a/modoboa/lib/tests.py
+++ b/modoboa/lib/tests.py
@@ -3,8 +3,6 @@
 
 from __future__ import unicode_literals
 
-import json
-
 from django.core import management
 from django.test import TestCase