From 0ea16b6bd4c3dc834a22b3af1c9fc0465fc3e2d1 Mon Sep 17 00:00:00 2001 From: I0x4dI Date: Tue, 10 Mar 2020 11:51:37 +0700 Subject: [PATCH] Remove AXES_REST_FRAMEWORK_ACTIVE settings flag --- axes/helpers.py | 2 +- axes/tests/test_utils.py | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/axes/helpers.py b/axes/helpers.py index cb8ee3a..3514417 100644 --- a/axes/helpers.py +++ b/axes/helpers.py @@ -144,7 +144,7 @@ def get_client_username(request, credentials: dict = None) -> str: "Using parameter request.POST to get username with key settings.AXES_USERNAME_FORM_FIELD" ) - request_data = request.data if settings.AXES_REST_FRAMEWORK_ACTIVE else request.POST + request_data = getattr(request, 'data', request.POST) return request_data.get(settings.AXES_USERNAME_FORM_FIELD, None) diff --git a/axes/tests/test_utils.py b/axes/tests/test_utils.py index b1e3f7f..2500d80 100644 --- a/axes/tests/test_utils.py +++ b/axes/tests/test_utils.py @@ -400,21 +400,6 @@ class UsernameTestCase(AxesTestCase): self.assertEqual(expected, actual) - @override_settings(AXES_REST_FRAMEWORK_ACTIVE=True) - def test_default_get_client_username_drf(self): - class DRFRequest: - def __init__(self): - self.data = {} - - expected = "test-username" - - request = DRFRequest() - request.data["username"] = expected - - actual = get_client_username(request) - - self.assertEqual(expected, actual) - @override_settings(AXES_USERNAME_FORM_FIELD="username") def test_default_get_client_username_credentials(self): expected = "test-username"