summaryrefslogtreecommitdiff
path: root/tests/serializers
diff options
context:
space:
mode:
authorKevin Christopher Henry <k@severian.com>2013-09-09 04:59:47 -0400
committerTim Graham <timograham@gmail.com>2013-09-09 16:03:13 -0400
commit9d700322b38ea670800a97f2b92dd2fc2c6ff28d (patch)
tree03972a5cf4a8b5eeb69909ddacbe33eeae1d2efd /tests/serializers
parenta52cc1c0888c2cedb07b2c0619c1a92a2f6e2c40 (diff)
Fixed #19885 -- cleaned up the django.test namespace
* override_settings may now be imported from django.test * removed Approximate from django.test * updated documentation for things importable from django.test Thanks akaariai for the suggestion.
Diffstat (limited to 'tests/serializers')
-rw-r--r--tests/serializers/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py
index 458847e4c7..34878adfd2 100644
--- a/tests/serializers/tests.py
+++ b/tests/serializers/tests.py
@@ -17,7 +17,8 @@ except ImportError:
from django.conf import settings
from django.core import management, serializers
from django.db import transaction, connection
-from django.test import TestCase, TransactionTestCase, Approximate
+from django.test import TestCase, TransactionTestCase
+from django.test.utils import Approximate
from django.utils import six
from django.utils.six import StringIO