Merge pull request #51 from PetrDlouhy/master

Fix test setup for Django 1.9.
tkaemming · Dec 17, 2015 · 3677f54 · 3677f54
2 parents d4213fa + 3306279
commit 3677f54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/subdomains/tests/tests.py b/subdomains/tests/tests.py
@@ -1,7 +1,6 @@
 import mock
 import warnings
 
-from django.contrib.sites.models import Site
 from django.core.urlresolvers import NoReverseMatch, set_urlconf
 from django.template import Context, Template
 from django.test import TestCase
@@ -24,6 +23,7 @@ class SubdomainTestMixin(object):
 
     def setUp(self):
         super(SubdomainTestMixin, self).setUp()
+        from django.contrib.sites.models import Site
         self.site = Site.objects.get_current()
         self.site.domain = self.DOMAIN
         self.site.save()

diff --git a/subdomains/utils.py b/subdomains/utils.py
@@ -5,11 +5,11 @@
     from urllib.parse import urlunparse
 
 from django.conf import settings
-from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse as simple_reverse
 
 
 def current_site_domain():
+    from django.contrib.sites.models import Site
     domain = Site.objects.get_current().domain
 
     prefix = 'www.'