summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAsif Saifuddin Auvi <auvipy@gmail.com>2017-02-25 12:48:20 +0600
committerTim Graham <timograham@gmail.com>2017-02-27 14:47:11 -0500
commit5f3a689f71dedced29b77763617244845aa8b99a (patch)
tree1ccf0136118c290fdf2a5a927a8a0c5bd197b9b3 /tests
parent6b00af50146335485d8414c42efec7d8dd5397fc (diff)
Imported django.http classes instead of django.http.
Diffstat (limited to 'tests')
-rw-r--r--tests/messages_tests/base.py6
-rw-r--r--tests/messages_tests/test_middleware.py6
-rw-r--r--tests/middleware_exceptions/views.py8
-rw-r--r--tests/redirects_tests/tests.py6
4 files changed, 13 insertions, 13 deletions
diff --git a/tests/messages_tests/base.py b/tests/messages_tests/base.py
index d05f73bb82..6cd0e11083 100644
--- a/tests/messages_tests/base.py
+++ b/tests/messages_tests/base.py
@@ -1,9 +1,9 @@
-from django import http
from django.contrib.messages import constants, get_level, set_level, utils
from django.contrib.messages.api import MessageFailure
from django.contrib.messages.constants import DEFAULT_LEVELS
from django.contrib.messages.storage import base, default_storage
from django.contrib.messages.storage.base import Message
+from django.http import HttpRequest, HttpResponse
from django.test import modify_settings, override_settings
from django.urls import reverse
from django.utils.translation import gettext_lazy
@@ -70,10 +70,10 @@ class BaseTests:
self.settings_override.disable()
def get_request(self):
- return http.HttpRequest()
+ return HttpRequest()
def get_response(self):
- return http.HttpResponse()
+ return HttpResponse()
def get_storage(self, data=None):
"""
diff --git a/tests/messages_tests/test_middleware.py b/tests/messages_tests/test_middleware.py
index b8be439d49..7f2e9b0c02 100644
--- a/tests/messages_tests/test_middleware.py
+++ b/tests/messages_tests/test_middleware.py
@@ -1,7 +1,7 @@
import unittest
-from django import http
from django.contrib.messages.middleware import MessageMiddleware
+from django.http import HttpRequest, HttpResponse
class MiddlewareTests(unittest.TestCase):
@@ -13,6 +13,6 @@ class MiddlewareTests(unittest.TestCase):
"""
MessageMiddleware is tolerant of messages not existing on request.
"""
- request = http.HttpRequest()
- response = http.HttpResponse()
+ request = HttpRequest()
+ response = HttpResponse()
self.middleware.process_response(request, response)
diff --git a/tests/middleware_exceptions/views.py b/tests/middleware_exceptions/views.py
index f006147daf..40bbd0f452 100644
--- a/tests/middleware_exceptions/views.py
+++ b/tests/middleware_exceptions/views.py
@@ -1,11 +1,11 @@
-from django import http
from django.core.exceptions import PermissionDenied
+from django.http import Http404, HttpResponse
from django.template import engines
from django.template.response import TemplateResponse
def normal_view(request):
- return http.HttpResponse('OK')
+ return HttpResponse('OK')
def template_response(request):
@@ -19,7 +19,7 @@ def template_response_error(request):
def not_found(request):
- raise http.Http404()
+ raise Http404()
def server_error(request):
@@ -35,7 +35,7 @@ def permission_denied(request):
def exception_in_render(request):
- class CustomHttpResponse(http.HttpResponse):
+ class CustomHttpResponse(HttpResponse):
def render(self):
raise Exception('Exception in HttpResponse.render()')
diff --git a/tests/redirects_tests/tests.py b/tests/redirects_tests/tests.py
index 558bbaaf7e..cfee12e5d2 100644
--- a/tests/redirects_tests/tests.py
+++ b/tests/redirects_tests/tests.py
@@ -1,9 +1,9 @@
-from django import http
from django.conf import settings
from django.contrib.redirects.middleware import RedirectFallbackMiddleware
from django.contrib.redirects.models import Redirect
from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured
+from django.http import HttpResponseForbidden, HttpResponseRedirect
from django.test import TestCase, modify_settings, override_settings
@@ -49,8 +49,8 @@ class RedirectTests(TestCase):
class OverriddenRedirectFallbackMiddleware(RedirectFallbackMiddleware):
# Use HTTP responses different from the defaults
- response_gone_class = http.HttpResponseForbidden
- response_redirect_class = http.HttpResponseRedirect
+ response_gone_class = HttpResponseForbidden
+ response_redirect_class = HttpResponseRedirect
@modify_settings(MIDDLEWARE={'append': 'redirects_tests.tests.OverriddenRedirectFallbackMiddleware'})