All tests pass

domains/__init__.py

@@ -6,7 +6,5 @@
 from __future__ import division
 from domains.utils import get_hooks, setup_hook
 
-
 for hook in get_hooks():
-    print(hook)
     setup_hook(hook)

domains/hooks/base.py

@@ -32,10 +32,7 @@ def coerce(self, v):
         return v
 
     def get(self):
-        try:
-            v = getattr(_thread_locals, self.attribute)
-        except AttributeError:
-            v = self.default_value
+        v = getattr(_thread_locals, self.attribute, self.default_value)
         return self.coerce(v)
 
     def set(self, value):
@@ -58,7 +55,7 @@ def __int__(self):
         try:
             return self.get()
         except AttributeError:
-            self.set(1)
+            self.set(self.default_value)
             return self.get()
 
 

domains/hooks/site_id.py

@@ -38,6 +38,7 @@ class SiteIDHook(IntHookBase):
     Dynamic SITE_ID attribute class
     """
     attribute = 'SITE_ID'
+    default_value = 1
 
     def __init__(self, *args, **kwargs):
         super(IntHookBase, self).__init__(*args, **kwargs)

domains/loaders/app_directories.py

@@ -10,72 +10,37 @@
 
 
 try:
+    # Django 1.7x or older
     from django.template.loaders.app_directories import app_template_dirs
 
-    class Loader(BaseLoader):
-        is_usable = True
-
-        def get_template_sources(self, template_name, template_dirs=None):
-            """
-            Looks in the saved request object from the middleware for
-            directories and passes back the path. Doesn't verify that the
-            path is valid, though.
-            """
-            if not template_dirs:
-                template_dirs = app_template_dirs
-
-            for template_dir in template_dirs:
-                try:
-                    template_parts = get_template_name(template_dir, template_name)
-                    if not template_parts:
-                        continue
-                    yield safe_join(*template_parts)
-                except UnicodeDecodeError:
-                    # The template dir name was a bytestring
-                    # that wasn't valid UTF-8.
-                    raise
-                except ValueError:
-                    # The joined path was located outside of template_dir.
-                    pass
-
 except ImportError:
-    # The new Django 1.8 template API
+    # Django 1.8
     from django.template.utils import get_app_template_dirs
-    from django.core.exceptions import SuspiciousFileOperation
-    from django.template.base import TemplateDoesNotExist
-    import io
-
     app_template_dirs = get_app_template_dirs('templates')
 
-    class Loader(BaseLoader):
-        is_usable = True
-
-        def get_template_sources(self, template_name, template_dirs=None):
-            """
-            Returns the absolute paths to "template_name", when appended to each
-            directory in "template_dirs". Any paths that don't lie inside one of the
-            template dirs are excluded from the result set, for security reasons.
-            """
-            if not template_dirs:
-                template_dirs = get_app_template_dirs('templates')
-
-            for template_dir in template_dirs:
-                try:
-                    template_parts = get_template_name(template_dir, template_name)
-
-                    if not template_parts:
-                        continue
-                    yield safe_join(*template_parts)
-                except SuspiciousFileOperation:
-                    # The joined path was located outside of this template_dir
-                    # (it might be inside another one, so this isn't fatal).
-                    pass
 
-        def load_template_source(self, template_name, template_dirs=None):
-            for filepath in self.get_template_sources(template_name, template_dirs):
-                try:
-                    with io.open(filepath, encoding=self.engine.file_charset) as fp:
-                        return fp.read(), filepath
-                except IOError:
-                    pass
-            raise TemplateDoesNotExist(template_name)
+class Loader(BaseLoader):
+    is_usable = True
+
+    def get_template_sources(self, template_name, template_dirs=None):
+        """
+        Looks in the saved request object from the middleware for
+        directories and passes back the path. Doesn't verify that the
+        path is valid, though.
+        """
+        if not template_dirs:
+            template_dirs = app_template_dirs
+
+        for template_dir in template_dirs:
+            try:
+                template_parts = get_template_name(template_dir, template_name)
+                if not template_parts:
+                    continue
+                yield safe_join(*template_parts)
+            except UnicodeDecodeError:
+                # The template dir name was a bytestring
+                # that wasn't valid UTF-8.
+                raise
+            except ValueError:
+                # The joined path was located outside of template_dir.
+                pass

domains/tests.py

@@ -4,7 +4,7 @@
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
-from django import test
+from django import test, get_version
 from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings
 from django.conf.urls import url
@@ -210,8 +210,13 @@ def setUp(self):
     def test_1(self):
         for _ in range(0, 3):
             for pk, site in self.sites.items():
-                self.client.get('/', HTTP_HOST=site.domain)
-                curr = Site.objects.get_current()
+                resp = self.client.get('/', HTTP_HOST=site.domain)
+
+                if get_version() >= '1.8':
+                    curr = Site.objects.get_current(resp.context['request'])
+                else:
+                    curr = Site.objects.get_current()
+
                 self.assertEquals(curr.domain, site.domain)
                 self.assertEquals(curr.pk, site.pk)
 

domains/utils.py

@@ -35,7 +35,7 @@ def setup_hook(hook):
 
     installed_hooks[hook_instance.attribute] = hook_instance
     setattr(settings, hook_instance.attribute, hook_instance)
-    print("installed", installed_hooks)
+
 
 def get_installed_hooks():
     return installed_hooks

setup.py

@@ -31,7 +31,8 @@ def version():
 
 if __name__ == '__main__':
     setup(name=ROOT_PACKAGE,
-          description='An application that allows you to run many different sites on one Django instance',
+          description=('An application that allows you to run many '
+                       'different sites on one Django instance'),
           author='Mikhail Porokhovnichenko',
           author_email='marazmiki@gmail.com',
           version=version(),
@@ -44,5 +45,4 @@ def version():
               'Environment :: Web Environment',
               'Programming Language :: Python',
               'Framework :: Django'
-          ],
-    )
+          ])

tests.py

@@ -13,7 +13,7 @@
 TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'
 
 if get_version() >= '1.6':
-    TEST_RUNNER='django.test.runner.DiscoverRunner'
+    TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 
 
 SETTINGS = dict(
@@ -61,18 +61,24 @@
     'django.template.loaders.app_directories.Loader',
 )
 
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.template.context_processors.request',
+)
+
 if get_version() >= '1.8':
     SETTINGS['TEMPLATES'] = [
         {
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
             'OPTIONS': {
-                'loaders': TEMPLATE_LOADERS
+                'loaders': TEMPLATE_LOADERS,
+                'context_processors': TEMPLATE_CONTEXT_PROCESSORS,
             },
-        },
-]   
+        }]
 
 else:
-    SETTINGS['TEMPLATE_LOADERS'] = TEMPLATE_LOADERS
+    SETTINGS.update(TEMPLATE_LOADERS=TEMPLATE_LOADERS)
+
 
 settings.configure(**SETTINGS)