From eb41dc0ea07ac40db447dd446410f115e9d2bb85 Mon Sep 17 00:00:00 2001 From: romgar Date: Thu, 24 Nov 2016 21:31:55 +0000 Subject: [PATCH] Prevent test manual import for Django 1.6+. No impact on Django 1.7/1.8, duplicating all test runs in Django 1.6 --- model_utils/tests/tests.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/model_utils/tests/tests.py b/model_utils/tests/tests.py index 39eced3..b023bad 100644 --- a/model_utils/tests/tests.py +++ b/model_utils/tests/tests.py @@ -1,6 +1,9 @@ +import django + # Needed for Django 1.4/1.5 test runner -from .test_fields import * -from .test_managers import * -from .test_models import * -from .test_choices import * -from .test_miscellaneous import * +if django.VERSION < (1, 6): + from .test_fields import * + from .test_managers import * + from .test_models import * + from .test_choices import * + from .test_miscellaneous import *