From 5f5b34d50e26ff68305c4f54405ee9753a191917 Mon Sep 17 00:00:00 2001
From: Jonathan Willitts <JonathanWillitts@users.noreply.github.com>
Date: Wed, 28 Apr 2021 23:26:21 +0100
Subject: [PATCH] Fix failing tests to work with Django (4.0) main dev branch

---
 CHANGES.rst         | 5 +++++
 README.rst          | 2 +-
 defender/config.py  | 4 ++--
 defender/signals.py | 8 ++++----
 tox.ini             | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9710e18..d4bbb8b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 Changes
 =======
 
+Unreleased
+----------
+
+* Fix failing tests for Django main development branch (Django 4.0)
+
 0.9.0
 -----
 
diff --git a/README.rst b/README.rst
index fa68597..00f3eb5 100644
--- a/README.rst
+++ b/README.rst
@@ -397,7 +397,7 @@ There's sample ``BasicAuthenticationDefender`` class based on ``djangorestframew
    import base64
    import binascii
 
-   from django.utils.translation import ugettext_lazy as _
+   from django.utils.translation import gettext_lazy as _
 
    from rest_framework import HTTP_HEADER_ENCODING, exceptions
    from rest_framework.authentication import (
diff --git a/defender/config.py b/defender/config.py
index cc6b710..ef19ae9 100644
--- a/defender/config.py
+++ b/defender/config.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 
 def get_setting(variable, default=None):
@@ -61,7 +61,7 @@ except ValueError:  # pragma: no cover
 
 LOCKOUT_TEMPLATE = get_setting("DEFENDER_LOCKOUT_TEMPLATE")
 
-ERROR_MESSAGE = ugettext_lazy(
+ERROR_MESSAGE = gettext_lazy(
     "Please enter a correct username and password. "
     "Note that both fields are case-sensitive."
 )
diff --git a/defender/signals.py b/defender/signals.py
index a0674b2..5a16985 100644
--- a/defender/signals.py
+++ b/defender/signals.py
@@ -1,9 +1,9 @@
 from django.dispatch import Signal
 
-username_block = Signal(providing_args=["username"])
-username_unblock = Signal(providing_args=["username"])
-ip_block = Signal(providing_args=["ip_address"])
-ip_unblock = Signal(providing_args=["ip_address"])
+username_block = Signal()  # (providing_args=["username"])
+username_unblock = Signal()  # (providing_args=["username"])
+ip_block = Signal()  # (providing_args=["ip_address"])
+ip_unblock = Signal()  # (providing_args=["ip_address"])
 
 
 class BlockSignal:
diff --git a/tox.ini b/tox.ini
index 591e9c7..4a8efd1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    # list of supported Django/Python versioons:
+    # list of supported Django/Python versions:
     py{36,37,38,39,py3}-dj{22,31,32}
     py{38,39}-djmain
     py38-{lint,docs}