Fixed a unicode encoding bug in the contact form.

Also removed duplicated code.

2 files changed, 10 insertions, 4 deletions

diff --git a/contact/forms.py b/contact/forms.py
index 0c0e4f20..b8ae31f9 100644
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -10,7 +10,7 @@ class BaseContactForm(AkismetContactForm):
         return "[Contact form] " + self.cleaned_data["message_subject"]
 
     def message(self):
-        return "From: %(name)s <%(email)s>\n\n%(body)s" % self.cleaned_data
+        return u"From: {name} <{email}>\n\n{body}".format(**self.cleaned_data)
 
 class FoundationContactForm(BaseContactForm):
     recipient_list = ["dsf-board@googlegroups.com"]
@@ -27,6 +27,3 @@ class CoCFeedbackForm(BaseContactForm):
 
     def subject(self):
         return "Django Code of Conduct feedback"
-
-    def message(self):
-        return "From: {name} <{email}>\n\n{body}".format(**self.cleaned_data)
diff --git a/contact/tests.py b/contact/tests.py
index df18a68a..f0db8d72 100644
--- a/contact/tests.py
+++ b/contact/tests.py
@@ -24,3 +24,12 @@ class ContactFormTests(TestCase):
         resp = self.client.post('/contact/code-of-conduct/', data)
         self.assertRedirects(resp, '/conduct/')
         self.assertEqual(mail.outbox[-1].subject, 'Django Code of Conduct feedback')
+
+    def test_coc_contact_unicode(self):
+        data = {
+            'name': 'A. Random Hacker',
+            'email': 'a.random@example.com',
+            'body': u'Hello, \u2603!'
+        }
+        resp = self.client.post('/contact/code-of-conduct/', data)
+        self.assertRedirects(resp, '/conduct/')