fix: 2to3 locale corrections

smash/web/models/mail_template.py

@@ -225,7 +225,7 @@ class MailTemplate(models.Model):
             voucher = instance
         # set locale to get correct date format
         locale_name = self.get_locale_name()
-        with setlocale(locale_name.encode('utf8')):
+        with setlocale(locale_name):
             replacements = {}
             replacements.update(self.get_generic_replacements(Worker.get_by_user(user)))
             replacements.update(self.get_appointment_replacements(appointment))

smash/web/tests/models/test_mail_template.py

@@ -78,7 +78,7 @@ class MailTemplateModelTests(TestCase):
         appointment_template_french = MailTemplate(name=template_name_french, language=self.french_language,
                                                    context=MAIL_TEMPLATE_CONTEXT_APPOINTMENT,
                                                    template_file=self.template_file)
-        stream = io.StringIO()
+        stream = io.BytesIO()
         appointment_template_french.apply(appointment, self.user, stream)
         doc = Document(stream)
         worker_name = str(self.user.worker)
@@ -94,7 +94,7 @@ class MailTemplateModelTests(TestCase):
         appointment_template_french = MailTemplate(name=template_name_french, language=self.french_language,
                                                    context=MAIL_TEMPLATE_CONTEXT_APPOINTMENT,
                                                    template_file=self.template_file)
-        stream = io.StringIO()
+        stream = io.BytesIO()
         appointment_template_french.apply(appointment, self.user, stream)
         doc = Document(stream)
         self.check_doc_contains(doc, [flying_team_name])
@@ -105,7 +105,7 @@ class MailTemplateModelTests(TestCase):
         subject_template_french = MailTemplate(name=template_name_french, language=self.french_language,
                                                context=MAIL_TEMPLATE_CONTEXT_SUBJECT,
                                                template_file=self.template_file)
-        stream = io.StringIO()
+        stream = io.BytesIO()
         subject_template_french.apply(subject, self.user, stream)
         doc = Document(stream)
         worker_name = str(self.user.worker)
@@ -120,7 +120,7 @@ class MailTemplateModelTests(TestCase):
                                                context=MAIL_TEMPLATE_CONTEXT_VOUCHER,
                                                template_file="voucher_test.docx")
         voucher = create_voucher(study_subject=subject)
-        stream = io.StringIO()
+        stream = io.BytesIO()
         subject_template_french.apply(voucher, self.user, stream)
         doc = Document(stream)
         worker_name = str(self.user.worker)
@@ -137,7 +137,7 @@ class MailTemplateModelTests(TestCase):
                                                context=MAIL_TEMPLATE_CONTEXT_VOUCHER,
                                                template_file="template_with_tables.docx")
         voucher = create_voucher(study_subject=subject)
-        stream = io.StringIO()
+        stream = io.BytesIO()
         subject_template_french.apply(voucher, self.user, stream)
         doc = Document(stream)
         worker_name = str(self.user.worker)
@@ -220,7 +220,7 @@ class MailTemplateModelTests(TestCase):
         visit_template_french = MailTemplate(name=template_name_french, language=self.french_language,
                                              context=MAIL_TEMPLATE_CONTEXT_VISIT,
                                              template_file=self.template_file)
-        stream = io.StringIO()
+        stream = io.BytesIO()
         visit_template_french.apply(visit, self.user, stream)
         doc = Document(stream)
         worker_name = str(self.user.worker)

smash/web/views/mails.py

@@ -103,7 +103,7 @@ class MailTemplatesDeleteView(DeleteView, WrappedView):
 def generate(request, mail_template_id, instance_id):
     mail_template = get_object_or_404(MailTemplate, id=mail_template_id)
     instance = get_object_or_404(CONTEXT_TYPES_MAPPING[mail_template.context], id=instance_id)
-    stream = io.StringIO()
+    stream = io.BytesIO()
     stream = mail_template.apply(instance, request.user, stream)
     file_size = stream.tell()
     stream.seek(0)
@@ -121,12 +121,12 @@ def generate_for_vouchers(request):
             vouchers.append(Voucher.objects.get(pk=int(voucher_id)))
     templates = MailTemplate.get_voucher_mail_templates([])[0]
 
-    output_stream = io.StringIO()
+    output_stream = io.BytesIO()
 
     inputs = []
     for template in templates:
         for voucher in vouchers:
-            input_stream = io.StringIO()
+            input_stream = io.BytesIO()
             input_stream = template.apply(voucher, request.user, input_stream)
             input_stream.seek(0)
             inputs.append(input_stream)