Skip to content

[pull] main from django:main #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 5, 2026
Merged

[pull] main from django:main #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/async/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def test_options_handler_responds_correctly(self):
if is_coroutine:
response = asyncio.run(response)

self.assertIsInstance(response, HttpResponse)
self.assertIs(type(response), HttpResponse)

def test_http_method_not_allowed_responds_correctly(self):
request_factory = RequestFactory()
Expand All @@ -137,7 +137,7 @@ def test_http_method_not_allowed_responds_correctly(self):
if is_coroutine:
response = asyncio.run(response)

self.assertIsInstance(response, HttpResponseNotAllowed)
self.assertIs(type(response), HttpResponseNotAllowed)

def test_base_view_class_is_sync(self):
"""
Expand Down
4 changes: 2 additions & 2 deletions tests/decorators/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ def sync_view(request):
return HttpResponse()

self.assertIs(sync_view.should_append_slash, False)
self.assertIsInstance(sync_view(HttpRequest()), HttpResponse)
self.assertIs(type(sync_view(HttpRequest())), HttpResponse)

async def test_no_append_slash_decorator_async_view(self):
@no_append_slash
async def async_view(request):
return HttpResponse()

self.assertIs(async_view.should_append_slash, False)
self.assertIsInstance(await async_view(HttpRequest()), HttpResponse)
self.assertIs(type(await async_view(HttpRequest())), HttpResponse)
4 changes: 2 additions & 2 deletions tests/decorators/test_csrf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,12 @@ def sync_view(request):
return HttpResponse()

self.assertIs(sync_view.csrf_exempt, True)
self.assertIsInstance(sync_view(HttpRequest()), HttpResponse)
self.assertIs(type(sync_view(HttpRequest())), HttpResponse)

async def test_csrf_exempt_decorator_async_view(self):
@csrf_exempt
async def async_view(request):
return HttpResponse()

self.assertIs(async_view.csrf_exempt, True)
self.assertIsInstance(await async_view(HttpRequest()), HttpResponse)
self.assertIs(type(await async_view(HttpRequest())), HttpResponse)
40 changes: 20 additions & 20 deletions tests/decorators/test_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ def my_view(request):

request = HttpRequest()
request.method = "GET"
self.assertIsInstance(my_view(request), HttpResponse)
self.assertIs(type(my_view(request)), HttpResponse)
request.method = "PUT"
self.assertIsInstance(my_view(request), HttpResponse)
self.assertIs(type(my_view(request)), HttpResponse)
request.method = "HEAD"
self.assertIsInstance(my_view(request), HttpResponseNotAllowed)
self.assertIs(type(my_view(request)), HttpResponseNotAllowed)
request.method = "POST"
self.assertIsInstance(my_view(request), HttpResponseNotAllowed)
self.assertIs(type(my_view(request)), HttpResponseNotAllowed)
request.method = "DELETE"
self.assertIsInstance(my_view(request), HttpResponseNotAllowed)
self.assertIs(type(my_view(request)), HttpResponseNotAllowed)

async def test_require_http_methods_methods_async_view(self):
@require_http_methods(["GET", "PUT"])
Expand All @@ -50,15 +50,15 @@ async def my_view(request):

request = HttpRequest()
request.method = "GET"
self.assertIsInstance(await my_view(request), HttpResponse)
self.assertIs(type(await my_view(request)), HttpResponse)
request.method = "PUT"
self.assertIsInstance(await my_view(request), HttpResponse)
self.assertIs(type(await my_view(request)), HttpResponse)
request.method = "HEAD"
self.assertIsInstance(await my_view(request), HttpResponseNotAllowed)
self.assertIs(type(await my_view(request)), HttpResponseNotAllowed)
request.method = "POST"
self.assertIsInstance(await my_view(request), HttpResponseNotAllowed)
self.assertIs(type(await my_view(request)), HttpResponseNotAllowed)
request.method = "DELETE"
self.assertIsInstance(await my_view(request), HttpResponseNotAllowed)
self.assertIs(type(await my_view(request)), HttpResponseNotAllowed)


class RequireSafeDecoratorTest(SimpleTestCase):
Expand All @@ -69,15 +69,15 @@ def my_view(request):
my_safe_view = require_safe(my_view)
request = HttpRequest()
request.method = "GET"
self.assertIsInstance(my_safe_view(request), HttpResponse)
self.assertIs(type(my_safe_view(request)), HttpResponse)
request.method = "HEAD"
self.assertIsInstance(my_safe_view(request), HttpResponse)
self.assertIs(type(my_safe_view(request)), HttpResponse)
request.method = "POST"
self.assertIsInstance(my_safe_view(request), HttpResponseNotAllowed)
self.assertIs(type(my_safe_view(request)), HttpResponseNotAllowed)
request.method = "PUT"
self.assertIsInstance(my_safe_view(request), HttpResponseNotAllowed)
self.assertIs(type(my_safe_view(request)), HttpResponseNotAllowed)
request.method = "DELETE"
self.assertIsInstance(my_safe_view(request), HttpResponseNotAllowed)
self.assertIs(type(my_safe_view(request)), HttpResponseNotAllowed)

async def test_require_safe_accepts_only_safe_methods_async_view(self):
@require_safe
Expand All @@ -86,15 +86,15 @@ async def async_view(request):

request = HttpRequest()
request.method = "GET"
self.assertIsInstance(await async_view(request), HttpResponse)
self.assertIs(type(await async_view(request)), HttpResponse)
request.method = "HEAD"
self.assertIsInstance(await async_view(request), HttpResponse)
self.assertIs(type(await async_view(request)), HttpResponse)
request.method = "POST"
self.assertIsInstance(await async_view(request), HttpResponseNotAllowed)
self.assertIs(type(await async_view(request)), HttpResponseNotAllowed)
request.method = "PUT"
self.assertIsInstance(await async_view(request), HttpResponseNotAllowed)
self.assertIs(type(await async_view(request)), HttpResponseNotAllowed)
request.method = "DELETE"
self.assertIsInstance(await async_view(request), HttpResponseNotAllowed)
self.assertIs(type(await async_view(request)), HttpResponseNotAllowed)


class ConditionDecoratorTest(SimpleTestCase):
Expand Down
Loading