Merge branch 'develop'

Conflicts: export/utils.py
praekelt · Oct 16, 2014 · e4489e3 · e4489e3
2 parents 838b2be + 352162c
commit e4489e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/export/tools.py b/export/tools.py
@@ -77,7 +77,7 @@ def mail_response(self, request, extra_context=None):
         # if celery is available send the task, else run as normal
         if self.has_celery():
             return tasks.mail_export.delay(request.user.email, filename, data)
-        return utils.mail_export(request, filename, data)
+        return utils.mail_export(request.user.email, filename, data)
 
     def view(self, request, extra_context=None, process_form=True):
         form = extra_context['form']

diff --git a/export/utils.py b/export/utils.py
@@ -8,7 +8,7 @@
 def mail_export(email, filename, data):
     zip_data = StringIO.StringIO()
     zipfile = ZipFile(zip_data, mode='w')
-    zipfile.writestr(str(filename), str(data))
+    zipfile.writestr(str(filename), data.encode('utf-8'))
     zipfile.close()
 
     subject = _("Database Export")