diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 16:01:13 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 21:37:56 +0100 |
| commit | e32095616c50bef9b06dc8637a99584ba947bae5 (patch) | |
| tree | cf37f3c2201a0ad6053e9f4acf8a7e6c3507e410 /tests/serializers/tests.py | |
| parent | da16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff) | |
| download | django-e32095616c50bef9b06dc8637a99584ba947bae5.tar.gz | |
Imported override_settings from its new location.
Diffstat (limited to 'tests/serializers/tests.py')
| -rw-r--r-- | tests/serializers/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py index b9e3bb543f..6433101878 100644 --- a/tests/serializers/tests.py +++ b/tests/serializers/tests.py @@ -16,8 +16,8 @@ except ImportError: from django.core import management, serializers from django.db import transaction, connection -from django.test import TestCase, TransactionTestCase -from django.test.utils import Approximate, override_settings +from django.test import TestCase, TransactionTestCase, override_settings +from django.test.utils import Approximate from django.utils import six from django.utils.six import StringIO |