Imported override_settings from its new location.

This commit is contained in:
Aymeric Augustin 2013-12-23 16:01:13 +01:00
parent da16bb30ff
commit e32095616c
91 changed files with 113 additions and 154 deletions

View file

@ -20,9 +20,9 @@ from django.db.models import Sum, Avg, Variance, StdDev
from django.db.models.fields import (AutoField, DateField, DateTimeField,
DecimalField, IntegerField, TimeField)
from django.db.utils import ConnectionHandler
from django.test import (TestCase, skipUnlessDBFeature, skipIfDBFeature,
TransactionTestCase)
from django.test.utils import override_settings, str_prefix
from django.test import (TestCase, TransactionTestCase, override_settings,
skipUnlessDBFeature, skipIfDBFeature)
from django.test.utils import str_prefix
from django.utils import six
from django.utils.six.moves import xrange