From a3796f430b96abe71f2f99f566d9f7655e89f268 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sun, 2 Jun 2013 21:04:47 +0100
Subject: Only use test import munging prior to Django 1.6's new test runner

---
 rest_framework/tests/tests.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rest_framework/tests/tests.py b/rest_framework/tests/tests.py
index 08f88e11..554ebd1a 100644
--- a/rest_framework/tests/tests.py
+++ b/rest_framework/tests/tests.py
@@ -4,11 +4,13 @@ runner to pick up the tests.  Yowzers.
 """
 from __future__ import unicode_literals
 import os
+import django
 
 modules = [filename.rsplit('.', 1)[0]
            for filename in os.listdir(os.path.dirname(__file__))
            if filename.endswith('.py') and not filename.startswith('_')]
 __test__ = dict()
 
-for module in modules:
-    exec("from rest_framework.tests.%s import *" % module)
+if django.VERSION < (1, 6):
+    for module in modules:
+        exec("from rest_framework.tests.%s import *" % module)
-- 
cgit v1.2.3