1
0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00

Imported override_settings from its new location.

This commit is contained in:
Aymeric Augustin
2013-12-23 16:01:13 +01:00
parent da16bb30ff
commit e32095616c
91 changed files with 113 additions and 154 deletions

View File

@@ -19,7 +19,7 @@ from django.core.mail import (EmailMessage, mail_admins, mail_managers,
from django.core.mail.backends import console, dummy, locmem, filebased, smtp
from django.core.mail.message import BadHeaderError
from django.test import SimpleTestCase
from django.test.utils import override_settings
from django.test import override_settings
from django.utils.encoding import force_str, force_text
from django.utils.six import PY3, StringIO, string_types
from django.utils.translation import ugettext_lazy