From 25bd44c30007d5babecefed651827431569ee1ee Mon Sep 17 00:00:00 2001
From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Wed, 3 Sep 2014 23:49:47 +0200
Subject: Fix support for Django 1.7.

---
 tests/djapp/settings.py | 1 +
 tests/test_django.py    | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/djapp/settings.py b/tests/djapp/settings.py
index c1b79b0..c051faf 100644
--- a/tests/djapp/settings.py
+++ b/tests/djapp/settings.py
@@ -41,5 +41,6 @@ INSTALLED_APPS = [
     'tests.djapp'
 ]
 
+MIDDLEWARE_CLASSES = ()
 
 SECRET_KEY = 'testing.'
diff --git a/tests/test_django.py b/tests/test_django.py
index 95e0256..874c272 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -61,6 +61,8 @@ if django is not None:
 else:
     django_test = unittest
 
+if django is not None and django.VERSION >= (1, 7, 0):
+    django.setup()
 
 test_state = {}
 
-- 
cgit v1.2.3