diff options
author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 16:01:13 +0100 |
---|---|---|
committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 21:37:56 +0100 |
commit | e32095616c50bef9b06dc8637a99584ba947bae5 (patch) | |
tree | cf37f3c2201a0ad6053e9f4acf8a7e6c3507e410 /tests/requests | |
parent | da16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff) | |
download | django-e32095616c50bef9b06dc8637a99584ba947bae5.tar.gz |
Imported override_settings from its new location.
Diffstat (limited to 'tests/requests')
-rw-r--r-- | tests/requests/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/requests/tests.py b/tests/requests/tests.py index 850cf70c2f..bb56369371 100644 --- a/tests/requests/tests.py +++ b/tests/requests/tests.py @@ -13,9 +13,9 @@ from django.core.exceptions import SuspiciousOperation from django.core.handlers.wsgi import WSGIRequest, LimitedStream from django.http import (HttpRequest, HttpResponse, parse_cookie, build_request_repr, UnreadablePostError, RawPostDataException) -from django.test import SimpleTestCase, TransactionTestCase +from django.test import SimpleTestCase, TransactionTestCase, override_settings from django.test.client import FakePayload -from django.test.utils import override_settings, str_prefix +from django.test.utils import str_prefix from django.utils import six from django.utils.http import cookie_date, urlencode from django.utils.six.moves.urllib.parse import urlencode as original_urlencode |