Do not crash if a search feed is requested with unicode characters in…

… the query. Bug 606001.

apps/search/tests.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import shutil
 import time
@@ -161,6 +162,14 @@ def test_title(self):
         doc = pq(r.content.replace('xmlns', 'xmlnamespace'))
         eq_(doc('title').text(), "Firefox Input: 'lol'")
 
+    def test_unicode_title(self):
+        """Unicode in search queries must not fail. Bug 606001."""
+        r = self.client.get(reverse('search.feed'),
+                            {'product': 'firefox', 'q': u'é'})
+        doc = pq(r.content.replace('xmlns', 'xmlnamespace'))
+        eq_(doc('title').text(), u"Firefox Input: 'é'")
+
+
     def test_query(self):
         r = self.client.get(reverse('search.feed'),
                             dict(product='firefox',

apps/search/views.py

@@ -60,7 +60,7 @@ def title(self, obj):
         query = request.GET.get('q')
 
         # L10n: This is the title to the Search ATOM feed.
-        return (_("Firefox Input: '{query}'").format(query=query) if query else
+        return (_(u"Firefox Input: '{query}'").format(query=query) if query else
                 _('Firefox Input'))
 
     def items(self, obj):