Updating to Tower 0.3 and fixing the failing tests.

apps/search/__init__.py

@@ -1,4 +1,4 @@
-from l10n import ugettext_lazy as _lazy
+from tower import ugettext_lazy as _lazy
 from .utils import crc32
 
 

apps/search/tests/test_search.py

@@ -5,19 +5,16 @@ import os
 import shutil
 import time
 
-from django.test import TestCase, client
-from django.core.management import call_command
-from django.utils import translation
+from django.test import client
 
 from nose import SkipTest
-from nose.tools import eq_
 import test_utils
 import json
 
 from manage import settings
 from sumo.urlresolvers import reverse
 from search.utils import start_sphinx, stop_sphinx, reindex
-from search.clients import WikiClient, ForumClient
+from search.clients import WikiClient
 
 
 class SphinxTestCase(test_utils.TransactionTestCase):
@@ -66,17 +63,15 @@ class SearchTest(SphinxTestCase):
         results = wc.query('practice')
         self.assertNotEquals(0, len(results))
 
-
     def test_category_filter(self):
         wc = WikiClient()
         results = wc.query('', ({'filter': 'category', 'value': [13]},))
         self.assertNotEquals(0, len(results))
 
-
     def test_category_exclude(self):
         c = client.Client()
         response = c.get(reverse('search'),
-                         {'q': 'audio', 'format': 'json', 'w': 1})
+                         {'q': 'audio', 'format': 'json', 'w': 3})
         self.assertNotEquals(0, json.loads(response.content)['total'])
 
         response = c.get(reverse('search'),

apps/search/views.py

@@ -10,7 +10,7 @@ from django.conf import settings
 from django.http import HttpResponse
 
 import jingo
-from l10n import ugettext as _
+from tower import ugettext as _
 from flatqs import flatten
 
 from sumo.utils import paginate
@@ -84,7 +84,7 @@ def search(request):
             filters_w.append({
                 'filter': 'category',
                 'value': exclude_categories,
-                'exclude': True
+                'exclude': True,
             })
 
         # Locale filter

apps/sumo/middleware.py

@@ -9,7 +9,7 @@ import urllib
 from django.http import HttpResponsePermanentRedirect
 from django.utils.encoding import smart_str
 
-import l10n
+import tower
 
 from . import urlresolvers
 from sumo.helpers import urlparams
@@ -55,4 +55,4 @@ class LocaleURLMiddleware(object):
 
         request.path_info = '/' + prefixer.shortened_path
         request.locale = prefixer.locale
-        l10n.activate(prefixer.locale)
+        tower.activate(prefixer.locale)

settings.py

@@ -2,7 +2,7 @@
 import os
 import logging
 
-from l10n import ugettext_lazy as _lazy
+from tower import ugettext_lazy as _lazy
 
 import sumo_locales