Upgrade to Django==4.0.10

Author: chriswedgwood

cab/__init__.py

@@ -1,5 +1,5 @@
 def get_form():
-    from captcha.fields import ReCaptchaField
+    from django_recaptcha.fields import ReCaptchaField
     from django import forms
     from django_comments.forms import CommentForm
 

comments_spamfighter/admin.py

@@ -2,7 +2,7 @@
 
 from django import forms
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import Keyword
 

comments_spamfighter/models.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Keyword(models.Model):

djangosnippets/settings/base.py

@@ -53,15 +53,15 @@ def user_url(user):
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
-    "allauth.socialaccount.providers.bitbucket",
+    "allauth.socialaccount.providers.bitbucket_oauth2",
     "allauth.socialaccount.providers.github",
     "allauth.socialaccount.providers.twitter",
     "base",
     "cab",
     "comments_spamfighter",
     "ratings",
     "taggit",
-    "captcha",
+    "django_recaptcha",
     "django_extensions",
     "rest_framework",
     "django_htmx",
@@ -80,6 +80,7 @@ def user_url(user):
     "django.contrib.flatpages.middleware.FlatpageFallbackMiddleware",
     "ratelimitbackend.middleware.RateLimitMiddleware",
     "django_htmx.middleware.HtmxMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 )
 
 TEMPLATES = [

djangosnippets/settings/testing.py

@@ -9,6 +9,7 @@
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django_htmx.middleware.HtmxMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 )
 
 
@@ -24,7 +25,7 @@
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
-    "allauth.socialaccount.providers.bitbucket",
+    "allauth.socialaccount.providers.bitbucket_oauth2",
     "allauth.socialaccount.providers.github",
     "allauth.socialaccount.providers.twitter",
     "base",