From 9d700322b38ea670800a97f2b92dd2fc2c6ff28d Mon Sep 17 00:00:00 2001 From: Kevin Christopher Henry Date: Mon, 9 Sep 2013 04:59:47 -0400 Subject: 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. --- tests/aggregation/tests.py | 3 ++- tests/aggregation_regress/tests.py | 3 ++- tests/expressions_regress/tests.py | 3 ++- tests/serializers/tests.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py index ce7f4e9b9d..5abd4aaf6c 100644 --- a/tests/aggregation/tests.py +++ b/tests/aggregation/tests.py @@ -6,7 +6,8 @@ import re from django.db import connection from django.db.models import Avg, Sum, Count, Max, Min -from django.test import TestCase, Approximate +from django.test import TestCase +from django.test.utils import Approximate from django.test.utils import CaptureQueriesContext from .models import Author, Publisher, Book, Store diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py index 8388e78dbe..b8ec14d1dc 100644 --- a/tests/aggregation_regress/tests.py +++ b/tests/aggregation_regress/tests.py @@ -8,7 +8,8 @@ from operator import attrgetter from django.core.exceptions import FieldError from django.contrib.contenttypes.models import ContentType from django.db.models import Count, Max, Avg, Sum, StdDev, Variance, F, Q -from django.test import TestCase, Approximate, skipUnlessDBFeature +from django.test import TestCase, skipUnlessDBFeature +from django.test.utils import Approximate from django.utils import six from .models import (Author, Book, Publisher, Clues, Entries, HardbackBook, diff --git a/tests/expressions_regress/tests.py b/tests/expressions_regress/tests.py index c4f8085804..eb807cb050 100644 --- a/tests/expressions_regress/tests.py +++ b/tests/expressions_regress/tests.py @@ -7,7 +7,8 @@ import datetime from django.db import connection from django.db.models import F -from django.test import TestCase, Approximate, skipUnlessDBFeature +from django.test import TestCase, skipUnlessDBFeature +from django.test.utils import Approximate from .models import Number, Experiment 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 -- cgit v1.3