summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-06-24 21:00:28 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-06-24 21:00:28 +0200
commite2b86571bfa3503fe43adfa92e9c9f4271a7a135 (patch)
treebf8b5e51dc5280f6085013b86ab298aa9b2abecb
parente3b6fed320f6e67b7e5dc28bab610f342a81f7d7 (diff)
[1.4.x] Fixed oversight in e3b6fed3. Refs #20636.
-rw-r--r--django/test/utils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index e31654e5c6..0988d89482 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -3,8 +3,8 @@ from __future__ import with_statement
import warnings
from django.conf import settings, UserSettingsHolder
from django.core import mail
+from django import http
from django.test.signals import template_rendered, setting_changed
-from django.http import request
from django.template import Template, loader, TemplateDoesNotExist
from django.template.loaders import cached
from django.utils.translation import deactivate
@@ -79,7 +79,7 @@ def setup_test_environment():
mail._original_email_backend = settings.EMAIL_BACKEND
settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
- request._original_allowed_hosts = settings.ALLOWED_HOSTS
+ http._original_allowed_hosts = settings.ALLOWED_HOSTS
settings.ALLOWED_HOSTS = ['*']
mail.outbox = []
@@ -100,8 +100,8 @@ def teardown_test_environment():
settings.EMAIL_BACKEND = mail._original_email_backend
del mail._original_email_backend
- settings.ALLOWED_HOSTS = request._original_allowed_hosts
- del request._original_allowed_hosts
+ settings.ALLOWED_HOSTS = http._original_allowed_hosts
+ del http._original_allowed_hosts
del mail.outbox