From 1f6d387907c441a6761bc7da6199f088d4a94ae0 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 27 Aug 2013 20:18:45 +0200 Subject: [PATCH] Password and adresses can contain non ascii chars... fixes #470 --- modoboa/admin/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index 6a2134c29..2f0b73be7 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -547,7 +547,7 @@ class User(AbstractBaseUser, PermissionsMixin): dom.add_admin(self) def to_csv(self, csvwriter): - row = ["account", self.username.encode("utf-8"), self.password, + row = ["account", self.username.encode("utf-8"), self.password.encode("utf-8"), self.first_name.encode("utf-8"), self.last_name.encode("utf-8"), self.is_active, self.group, self.email] if self.group == "DomainAdmins": @@ -1195,7 +1195,7 @@ class Alias(DatesAware): self.save(int_rcpts, ext_rcpts, creator=user) def to_csv(self, csvwriter): - row = [self.type, self.full_address, self.enabled] + row = [self.type, self.full_address.encode("utf-8"), self.enabled] row += self.get_recipients() csvwriter.writerow(row)