Avoided a django-hosts deprecation warning.

charettes · Dec 20, 2015 · 16c8dd8 · 16c8dd8
1 parent 37d12f0
commit 16c8dd8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/tenancy/middleware.py b/tenancy/middleware.py
@@ -20,11 +20,11 @@ def __init__(self):
             )
         path = "%s.%s" % (self.__module__, self.__class__.__name__)
         for middleware in settings.MIDDLEWARE_CLASSES:
-            if middleware == 'django_hosts.middleware.HostsMiddleware':
+            if middleware == 'django_hosts.middleware.HostsRequestMiddleware':
                 break
             elif middleware == path:
                 raise ImproperlyConfigured(
-                    "Make sure that 'django_hosts.middleware.HostsMiddleware' "
+                    "Make sure that 'django_hosts.middleware.HostsRequestMiddleware' "
                     "is placed before '%s' in your `MIDDLEWARE_CLASSES` "
                     "setting." % path
                 )

diff --git a/tests/test_hosts.py b/tests/test_hosts.py
@@ -21,10 +21,11 @@ def django_hosts_installed_setup(func):
     func = override_settings(
         DEFAULT_HOST='default',
         ROOT_HOSTCONF='tests.hosts',
-        MIDDLEWARE_CLASSES=(
-            'django_hosts.middleware.HostsMiddleware',
-            'tenancy.middleware.TenantHostMiddleware'
-        )
+        MIDDLEWARE_CLASSES=[
+            'django_hosts.middleware.HostsRequestMiddleware',
+            'tenancy.middleware.TenantHostMiddleware',
+            'django_hosts.middleware.HostsResponseMiddleware',
+        ],
     )(func)
     return skipUnless(
         django_hosts,
@@ -52,13 +53,13 @@ def test_not_installed(self):
     @override_settings(
         MIDDLEWARE_CLASSES=(
             'tenancy.middleware.TenantHostMiddleware',
-            'django_hosts.middleware.HostsMiddleware'
+            'django_hosts.middleware.HostsRequestMiddleware',
         )
     )
     def test_wrong_order(self):
         self.assertRaisesMessage(
             ImproperlyConfigured,
-            "Make sure that 'django_hosts.middleware.HostsMiddleware' is "
+            "Make sure that 'django_hosts.middleware.HostsRequestMiddleware' is "
             "placed before 'tenancy.middleware.TenantHostMiddleware' in your "
             "`MIDDLEWARE_CLASSES` setting.",
             TenantHostMiddleware