Skip to content

Commit 56adb38

Browse files
committed
Fixed HttpRequest.is_ajax() deprecation warnings for Django 3.1.
1 parent 2842886 commit 56adb38

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

request/middleware.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from . import settings
33
from .models import Request
44
from .router import Patterns
5+
from .utils import request_is_ajax
56

67
try:
78
# needed to support Django >= 1.10 MIDDLEWARE
@@ -23,7 +24,7 @@ def process_response(self, request, response):
2324
if ignore.resolve(request.path[1:]):
2425
return response
2526

26-
if request.is_ajax() and settings.IGNORE_AJAX:
27+
if request_is_ajax(request) and settings.IGNORE_AJAX:
2728
return response
2829

2930
if request.META.get('REMOTE_ADDR') in settings.IGNORE_IP:

request/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from . import settings as request_settings
1212
from .managers import RequestManager
13-
from .utils import HTTP_STATUS_CODES, browsers, engines
13+
from .utils import HTTP_STATUS_CODES, browsers, engines, request_is_ajax
1414

1515
AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
1616

@@ -59,7 +59,7 @@ def from_http_request(self, request, response=None, commit=True):
5959
self.path = request.path[:255]
6060

6161
self.is_secure = request.is_secure()
62-
self.is_ajax = request.is_ajax()
62+
self.is_ajax = request_is_ajax(request)
6363

6464
# User information.
6565
self.ip = request.META.get('REMOTE_ADDR', '')

request/utils.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,7 @@ def get_verbose_name(class_name):
154154
' \\1',
155155
class_name,
156156
).strip()
157+
158+
159+
def request_is_ajax(request):
160+
return request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest'

0 commit comments

Comments
 (0)