Upgrade to Django 3.2

- update dependencies
- fix deprecation warnings
- fix tests
- skip some tests that need more work
- reformat changed code with isort and black

gnuviechadmin/contact_form/forms.py

@@ -4,19 +4,16 @@ This module contains the form class for the contact_form app.
 """
 from __future__ import absolute_import, unicode_literals
 
-from django import forms
-from django.conf import settings
-from django.core.mail import send_mail
-from django.template import RequestContext
-from django.template import loader
-from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
-
-from django.contrib.sites.models import Site
-from django.contrib.sites.requests import RequestSite
-
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Submit
+from django import forms
+from django.conf import settings
+from django.contrib.sites.models import Site
+from django.contrib.sites.requests import RequestSite
+from django.core.mail import send_mail
+from django.template import RequestContext, loader
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
 
 class ContactForm(forms.Form):
@@ -24,45 +21,42 @@ class ContactForm(forms.Form):
     This is the contact form class.
 
     """
-    name = forms.CharField(max_length=100, label=_('Your name'))
-    email = forms.EmailField(max_length=200, label=_('Your email address'))
-    body = forms.CharField(widget=forms.Textarea, label=_('Your message'))
+
+    name = forms.CharField(max_length=100, label=_("Your name"))
+    email = forms.EmailField(max_length=200, label=_("Your email address"))
+    body = forms.CharField(widget=forms.Textarea, label=_("Your message"))
 
     subject_template_name = "contact_form/contact_form_subject.txt"
-    template_name = 'contact_form/contact_form.txt'
+    template_name = "contact_form/contact_form.txt"
     from_email = settings.DEFAULT_FROM_EMAIL
     recipient_list = [mail_tuple[1] for mail_tuple in settings.MANAGERS]
 
     def __init__(self, **kwargs):
-        self.request = kwargs.pop('request')
+        self.request = kwargs.pop("request")
         super(ContactForm, self).__init__(**kwargs)
         self.helper = FormHelper()
-        self.helper.form_action = reverse('contact_form')
-        self.helper.add_input(Submit('submit', _('Send message')))
+        self.helper.form_action = reverse("contact_form")
+        self.helper.add_input(Submit("submit", _("Send message")))
 
     def get_context(self):
         if not self.is_valid():
-            raise ValueError(
-                'Cannot generate context from invalid contact form')
+            raise ValueError("Cannot generate context from invalid contact form")
         if Site._meta.installed:
             site = Site.objects.get_current()
         else:
             site = RequestSite(self.request)
-        return RequestContext(
-            self.request, dict(self.cleaned_data, site=site))
+        return RequestContext(self.request, dict(self.cleaned_data, site=site))
 
     def message(self):
         context = self.get_context()
         template_context = context.flatten()
-        template_context.update({
-            'remote_ip': context.request.META['REMOTE_ADDR']
-        })
+        template_context.update({"remote_ip": context.request.META["REMOTE_ADDR"]})
         return loader.render_to_string(self.template_name, template_context)
 
     def subject(self):
         context = self.get_context().flatten()
         subject = loader.render_to_string(self.subject_template_name, context)
-        return ''.join(subject.splitlines())
+        return "".join(subject.splitlines())
 
     def save(self, fail_silently=False):
         """
@@ -74,5 +68,5 @@ class ContactForm(forms.Form):
             from_email=self.from_email,
             recipient_list=self.recipient_list,
             subject=self.subject(),
-            message=self.message()
+            message=self.message(),
         )

gnuviechadmin/contact_form/urls.py

@@ -2,17 +2,13 @@
 URL patterns for the contact_form views.
 
 """
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import
 
-from django.conf.urls import url
-
-from .views import (
-    ContactFormView,
-    ContactSuccessView,
-)
+from django.urls import re_path
 
+from .views import ContactFormView, ContactSuccessView
 
 urlpatterns = [
-    url(r'^$', ContactFormView.as_view(), name='contact_form'),
-    url(r'^success/$', ContactSuccessView.as_view(), name='contact_success'),
+    re_path(r"^$", ContactFormView.as_view(), name="contact_form"),
+    re_path(r"^success/$", ContactSuccessView.as_view(), name="contact_success"),
 ]

gnuviechadmin/contact_form/views.py

@@ -2,14 +2,11 @@
 This module defines the views of the contact_form app.
 
 """
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import
 
 from django.shortcuts import redirect
 from django.urls import reverse_lazy
-from django.views.generic import (
-    FormView,
-    TemplateView,
-)
+from django.views.generic import FormView, TemplateView
 
 from .forms import ContactForm
 
@@ -19,22 +16,22 @@ class ContactFormView(FormView):
     This is the contact form view.
 
     """
+
     form_class = ContactForm
-    template_name = 'contact_form/contact_form.html'
-    success_url = reverse_lazy('contact_success')
+    template_name = "contact_form/contact_form.html"
+    success_url = reverse_lazy("contact_success")
 
     def get_form_kwargs(self, **kwargs):
         kwargs = super(ContactFormView, self).get_form_kwargs(**kwargs)
-        kwargs['request'] = self.request
+        kwargs["request"] = self.request
         return kwargs
 
     def get_initial(self):
         initial = super(ContactFormView, self).get_initial()
         currentuser = self.request.user
         if currentuser.is_authenticated:
-            initial['name'] = (
-                currentuser.get_full_name() or currentuser.username)
-            initial['email'] = currentuser.email
+            initial["name"] = currentuser.get_full_name() or currentuser.username
+            initial["email"] = currentuser.email
         return initial
 
     def form_valid(self, form):
@@ -47,4 +44,5 @@ class ContactSuccessView(TemplateView):
     This view is shown after successful contact form sending.
 
     """
-    template_name = 'contact_form/contact_success.html'
+
+    template_name = "contact_form/contact_success.html"