This project is archived. Its data is read-only.

Commit e3209561 authored Dec 23, 2013 by Aymeric Augustin

Imported override_settings from its new location.

parent da16bb30

django/contrib/auth/tests/test_auth_backends.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,7 @@ from django.contrib.contenttypes.models import ContentType
		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

+1 −2

Original line number	Diff line number	Diff line
		@@ -11,9 +11,8 @@ from django.contrib.auth.tests.utils import skipIfCustomUser
		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

+1 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,7 @@ from django.contrib.auth.models import User, Permission
		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

+1 −2

Original line number	Diff line number	Diff line
		@@ -12,8 +12,7 @@ from django.contrib.auth.forms import (UserCreationForm, AuthenticationForm,
		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

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ from django.contrib.auth.models import User, Group
		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