Imported override_settings from its new location.

django/contrib/auth/tests/test_auth_backends.py

@@ -10,8 +10,7 @@
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.contrib.auth import authenticate, get_user
 from django.http import HttpRequest
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.contrib.auth.hashers import MD5PasswordHasher
 
 

django/contrib/auth/tests/test_basic.py

@@ -11,9 +11,8 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management import call_command
 from django.dispatch import receiver
-from django.test import TestCase
+from django.test import TestCase, override_settings
 from django.test.signals import setting_changed
-from django.test.utils import override_settings
 from django.utils import translation
 from django.utils.encoding import force_str
 from django.utils.six import binary_type, PY2, StringIO

django/contrib/auth/tests/test_context_processors.py

@@ -7,8 +7,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.context_processors import PermWrapper, PermLookupDict
 from django.db.models import Q
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.utils._os import upath
 
 

django/contrib/auth/tests/test_forms.py

@@ -12,8 +12,7 @@
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.core import mail
 from django.forms.fields import Field, CharField
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.utils.encoding import force_text
 from django.utils._os import upath
 from django.utils import translation

django/contrib/auth/tests/test_handlers.py

@@ -5,7 +5,7 @@
 from django.contrib.auth.tests.custom_user import CustomUser
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.test import TransactionTestCase
-from django.test.utils import override_settings
+from django.test import override_settings
 
 
 # This must be a TransactionTestCase because the WSGI auth handler performs

django/contrib/auth/tests/test_management.py

@@ -13,8 +13,7 @@
 from django.core.management import call_command
 from django.core.management.base import CommandError
 from django.core.management.validation import get_validation_errors
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.utils import six
 from django.utils.six import StringIO
 

django/contrib/auth/tests/test_models.py

@@ -3,8 +3,7 @@
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.core import mail
 from django.db.models.signals import post_save
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 
 @skipIfCustomUser

django/contrib/auth/tests/test_signals.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.test.utils import override_settings
+from django.test import override_settings
 
 
 @skipIfCustomUser

django/contrib/auth/tests/test_templates.py

@@ -7,7 +7,7 @@
     password_reset_complete, password_change, password_change_done,
 )
 from django.test import RequestFactory, TestCase
-from django.test.utils import override_settings
+from django.test import override_settings
 from django.utils.encoding import force_bytes, force_text
 from django.utils.http import urlsafe_base64_encode
 

django/contrib/auth/tests/test_views.py

@@ -14,8 +14,8 @@
 from django.utils.http import urlquote
 from django.utils.six.moves.urllib.parse import urlparse, ParseResult
 from django.utils._os import upath
-from django.test import TestCase
-from django.test.utils import override_settings, patch_logger
+from django.test import TestCase, override_settings
+from django.test.utils import patch_logger
 from django.middleware.csrf import CsrfViewMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
 

django/contrib/contenttypes/tests.py

@@ -5,8 +5,7 @@
 from django.contrib.sites.models import get_current_site
 from django.db import models
 from django.http import HttpRequest, Http404
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.utils.http import urlquote
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible

django/contrib/flatpages/tests/test_csrf.py

@@ -2,7 +2,7 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.test import TestCase, Client
-from django.test.utils import override_settings
+from django.test import override_settings
 
 
 @override_settings(

django/contrib/flatpages/tests/test_forms.py

@@ -3,8 +3,7 @@
 from django.conf import settings
 from django.contrib.flatpages.forms import FlatpageForm
 from django.contrib.flatpages.models import FlatPage
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.utils import translation
 
 

django/contrib/flatpages/tests/test_middleware.py

@@ -3,8 +3,7 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.flatpages.models import FlatPage
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 
 @override_settings(

django/contrib/flatpages/tests/test_templatetags.py

@@ -2,8 +2,7 @@
 from django.contrib.auth.models import AnonymousUser, User
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.template import Template, Context, TemplateSyntaxError
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 
 @override_settings(

django/contrib/flatpages/tests/test_views.py

@@ -3,8 +3,7 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.flatpages.models import FlatPage
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 
 @override_settings(

django/contrib/formtools/tests/tests.py

@@ -8,8 +8,7 @@
 
 from django import http
 from django.contrib.formtools import preview, utils
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.utils._os import upath
 
 from django.contrib.formtools.tests.forms import (

django/contrib/gis/tests/geoadmin/tests.py

@@ -4,8 +4,7 @@
 
 from django.contrib.gis.geos import HAS_GEOS
 from django.contrib.gis.tests.utils import HAS_SPATIAL_DB
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 if HAS_GEOS and HAS_SPATIAL_DB:
     from django.contrib.gis import admin

django/contrib/humanize/tests.py

@@ -11,8 +11,8 @@
 from django.conf import settings
 from django.contrib.humanize.templatetags import humanize
 from django.template import Template, Context, defaultfilters
-from django.test import TestCase
-from django.test.utils import override_settings, TransRealMixin
+from django.test import TestCase, override_settings
+from django.test.utils import TransRealMixin
 from django.utils.html import escape
 from django.utils.timezone import utc, get_fixed_timezone
 from django.utils import translation

django/contrib/messages/tests/base.py

@@ -9,7 +9,7 @@
 from django.contrib.messages.storage import default_storage, base
 from django.contrib.messages.storage.base import Message
 from django.core.urlresolvers import reverse
-from django.test.utils import modify_settings, override_settings
+from django.test import modify_settings, override_settings
 from django.utils.translation import ugettext_lazy
 
 

django/contrib/messages/tests/test_cookie.py

@@ -5,8 +5,7 @@
 from django.contrib.messages.storage.cookie import (CookieStorage,
     MessageEncoder, MessageDecoder)
 from django.contrib.messages.storage.base import Message
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.utils.safestring import SafeData, mark_safe
 
 

django/contrib/redirects/tests.py

@@ -2,8 +2,7 @@
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.exceptions import ImproperlyConfigured
-from django.test import TestCase
-from django.test.utils import modify_settings, override_settings
+from django.test import TestCase, modify_settings, override_settings
 from django.utils import six
 
 from .middleware import RedirectFallbackMiddleware

django/contrib/sessions/tests.py

@@ -20,8 +20,8 @@
 from django.core import management
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponse
-from django.test import TestCase, RequestFactory
-from django.test.utils import override_settings, patch_logger
+from django.test import TestCase, RequestFactory, override_settings
+from django.test.utils import patch_logger
 from django.utils import six
 from django.utils import timezone
 

django/contrib/sitemaps/tests/test_generic.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.test.utils import override_settings
+from django.test import override_settings
 
 from .base import TestModel, SitemapTestsBase
 

django/contrib/sitemaps/tests/test_https.py

@@ -2,7 +2,7 @@
 
 from datetime import date
 
-from django.test.utils import override_settings
+from django.test import override_settings
 
 from .base import SitemapTestsBase
 

django/contrib/sites/tests.py

@@ -4,8 +4,7 @@
 from django.contrib.sites.models import Site, RequestSite, get_current_site
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.http import HttpRequest
-from django.test import TestCase
-from django.test.utils import modify_settings, override_settings
+from django.test import TestCase, modify_settings, override_settings
 
 
 @modify_settings(INSTALLED_APPS={'append': 'django.contrib.sites'})

tests/admin_custom_urls/tests.py

@@ -3,8 +3,7 @@
 from django.contrib.admin.utils import quote
 from django.core.urlresolvers import reverse
 from django.template.response import TemplateResponse
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 from .models import Action, Person, Car
 

tests/admin_docs/tests.py

@@ -5,8 +5,7 @@
 from django.contrib.admindocs import utils
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
-from django.test import TestCase
-from django.test.utils import modify_settings, override_settings
+from django.test import TestCase, modify_settings, override_settings
 
 
 class MiscTests(TestCase):

tests/admin_filters/tests.py

@@ -8,9 +8,9 @@
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured
-from django.test import TestCase, RequestFactory
-from django.test.utils import override_settings, six
+from django.test import TestCase, RequestFactory, override_settings
 from django.utils.encoding import force_text
+from django.utils import six
 
 from .models import Book, Department, Employee
 

tests/admin_inlines/tests.py

@@ -4,8 +4,7 @@
 from django.contrib.admin.helpers import InlineAdminForm
 from django.contrib.auth.models import User, Permission
 from django.contrib.contenttypes.models import ContentType
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 # local test models
 from .admin import InnerInline

tests/admin_views/tests.py

@@ -29,7 +29,7 @@
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.utils import patch_logger
-from django.test.utils import override_settings
+from django.test import override_settings
 from django.utils import formats
 from django.utils import translation
 from django.utils.cache import get_max_age

tests/admin_widgets/tests.py

@@ -18,7 +18,7 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db.models import CharField, DateField
 from django.test import TestCase as DjangoTestCase
-from django.test.utils import override_settings
+from django.test import override_settings
 from django.utils import six
 from django.utils import translation
 

tests/backends/tests.py

@@ -20,9 +20,9 @@
 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
 

tests/bulk_create/tests.py

@@ -4,7 +4,7 @@
 
 from django.db import connection
 from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
-from django.test.utils import override_settings
+from django.test import override_settings
 
 from .models import Country, Restaurant, Pizzeria, State, TwoFields
 

tests/cache/tests.py

@@ -23,8 +23,8 @@
     UpdateCacheMiddleware, CacheMiddleware)
 from django.template import Template
 from django.template.response import TemplateResponse
-from django.test import TestCase, TransactionTestCase, RequestFactory
-from django.test.utils import (override_settings, IgnoreDeprecationWarningsMixin,
+from django.test import TestCase, TransactionTestCase, RequestFactory, override_settings
+from django.test.utils import (IgnoreDeprecationWarningsMixin,
     IgnorePendingDeprecationWarningsMixin)
 from django.utils import six
 from django.utils import timezone

tests/comment_tests/tests/__init__.py

@@ -3,8 +3,7 @@
 from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 from ..models import Article, Author
 

tests/comment_tests/tests/test_comment_form.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.contrib.comments.forms import CommentForm
 from django.contrib.comments.models import Comment
-from django.test.utils import override_settings
+from django.test import override_settings
 
 from . import CommentTestCase
 from ..models import Article

tests/comment_tests/tests/test_comment_utils_moderators.py

@@ -2,7 +2,7 @@
 from django.contrib.comments.moderation import (moderator, CommentModerator,
     AlreadyModerated)
 from django.core import mail
-from django.test.utils import override_settings
+from django.test import override_settings
 
 from . import CommentTestCase
 from ..models import Entry

tests/csrf_tests/tests.py

@@ -7,8 +7,7 @@
 from django.http import HttpRequest, HttpResponse
 from django.middleware.csrf import CsrfViewMiddleware, CSRF_KEY_LENGTH
 from django.template import RequestContext, Template
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 from django.views.decorators.csrf import csrf_exempt, requires_csrf_token, ensure_csrf_cookie
 
 

tests/defer_regress/tests.py

@@ -6,8 +6,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sessions.backends.db import SessionStore
 from django.db.models import Count
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
 
 from .models import (
     ResolveThis, Item, RelatedItem, Child, Leaf, Proxy, SimpleItem, Feature,