Attempting to add back in Django 1.4 and 1.5 support

.travis.yml

@@ -14,6 +14,17 @@ script:
 after_success:
   - coveralls
 env:
+  - DJANGO="Django==1.4.20"
+  - DJANGO="Django==1.5.12"
   - DJANGO="Django==1.6.11"
   - DJANGO="Django==1.7.8"
   - DJANGO="Django==1.8.2"
+
+matrix:
+  exclude:
+    # Django 1.4 doesn't support Python 3
+    - python: "3.3"
+      env: DJANGO="Django==1.4.20"
+    # Django 1.4 doesn't support Python 3
+    - python: "3.4"
+      env: DJANGO="Django==1.4.20"

test_plus/test.py

@@ -1,3 +1,4 @@
+import django
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
@@ -110,7 +111,11 @@ def make_user(self, username):
             test_user.save()
             return test_user
         else:
-            User = get_user_model()
+            if django.VERSION[0:2] >= 1.6:
+                User = get_user_model()
+            else:
+                from django.contrib.auth.models import User
+
             test_user = User.objects.create_user(
                 username,
                 '{0}@example.com'.format(username),

test_project/test_app/tests.py

@@ -4,8 +4,6 @@
 
 from test_plus.test import TestCase
 
-from .models import Data
-
 
 class UserFactory(factory.DjangoModelFactory):
     username = factory.Sequence(lambda n: 'user{}'.format(n))

test_project/test_project/settings.py

@@ -10,6 +10,7 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+import django
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 
@@ -44,7 +45,6 @@
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )