diff options
| author | Tom Christie | 2013-06-02 21:04:47 +0100 | 
|---|---|---|
| committer | Tom Christie | 2013-06-02 21:04:47 +0100 | 
| commit | a3796f430b96abe71f2f99f566d9f7655e89f268 (patch) | |
| tree | cb09f732b95561fa0c02fb6e3ff8a2011507fc0c /rest_framework | |
| parent | 959ece66e5718ab4586ba4810b13ecaa0f1e571f (diff) | |
| download | django-rest-framework-a3796f430b96abe71f2f99f566d9f7655e89f268.tar.bz2 | |
Only use test import munging prior to Django 1.6's new test runner
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/tests/tests.py | 6 | 
1 files 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)  | 
