Merge branch 'django-3.2' into 'master'

Upgrade to django 3.2

* Upgrade dependencies
* Fix ugettext
* Fix bad urls

See merge request ae-utbm/Sith!316

core/__init__.py

@@ -21,5 +21,3 @@
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
-
-default_app_config = "core.apps.SithConfig"

core/models.py

@@ -34,7 +34,7 @@ from django.contrib.auth.models import (
     GroupManager as AuthGroupManager,
     AnonymousUser as AuthAnonymousUser,
 )
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 from django.core import validators
 from django.core.exceptions import ValidationError, PermissionDenied

core/scss/processor.py

@@ -25,9 +25,9 @@
 
 import os
 import sass
+from urllib.parse import urljoin
 from django.utils.encoding import force_bytes, iri_to_uri
 from django.core.files.base import ContentFile
-from django.utils.six.moves.urllib.parse import urljoin
 from django.templatetags.static import static
 from django.conf import settings
 from core.scss.storage import ScssFileStorage, find_file

core/tests.py

@@ -402,32 +402,32 @@ class UserToolsTest(TestCase):
 
     def test_anonymous_user_unauthorized(self):
         response = self.client.get(reverse("core:user_tools"))
-        self.assertEquals(response.status_code, 403)
+        self.assertEqual(response.status_code, 403)
 
     def test_page_is_working(self):
         # Test for simple user
         self.client.login(username="guy", password="plop")
         response = self.client.get(reverse("core:user_tools"))
-        self.assertNotEquals(response.status_code, 500)
-        self.assertEquals(response.status_code, 200)
+        self.assertNotEqual(response.status_code, 500)
+        self.assertEqual(response.status_code, 200)
 
         # Test for root
         self.client.login(username="root", password="plop")
         response = self.client.get(reverse("core:user_tools"))
-        self.assertNotEquals(response.status_code, 500)
-        self.assertEquals(response.status_code, 200)
+        self.assertNotEqual(response.status_code, 500)
+        self.assertEqual(response.status_code, 200)
 
         # Test for skia
         self.client.login(username="skia", password="plop")
         response = self.client.get(reverse("core:user_tools"))
-        self.assertNotEquals(response.status_code, 500)
-        self.assertEquals(response.status_code, 200)
+        self.assertNotEqual(response.status_code, 500)
+        self.assertEqual(response.status_code, 200)
 
         # Test for comunity
         self.client.login(username="comunity", password="plop")
         response = self.client.get(reverse("core:user_tools"))
-        self.assertNotEquals(response.status_code, 500)
-        self.assertEquals(response.status_code, 200)
+        self.assertNotEqual(response.status_code, 500)
+        self.assertEqual(response.status_code, 200)
 
 
 # TODO: many tests on the pages:

core/urls.py

@@ -23,7 +23,7 @@
 #
 #
 
-from django.urls import re_path
+from django.urls import re_path, path
 
 from core.views import *
 
@@ -60,8 +60,8 @@ urlpatterns = [
         SithPasswordResetDoneView.as_view(),
         name="password_reset_done",
     ),
-    re_path(
-        r"^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$",
+    path(
+        r"reset/<str:uidb64>/<str:token>/",
         SithPasswordResetConfirmView.as_view(),
         name="password_reset_confirm",
     ),

core/views/files.py

@@ -29,7 +29,7 @@ from django.views.generic.edit import UpdateView, FormMixin, DeleteView
 from django.views.generic.detail import SingleObjectMixin
 from django.forms.models import modelform_factory
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.http import HttpResponse
 from wsgiref.util import FileWrapper
 from django.urls import reverse
@@ -147,7 +147,7 @@ class FileListView(ListView):
     def get_context_data(self, **kwargs):
         kwargs = super(FileListView, self).get_context_data(**kwargs)
         kwargs["popup"] = ""
-        if self.kwargs["popup"]:
+        if self.kwargs.get("popup") is not None:
             kwargs["popup"] = "popup"
         return kwargs
 
@@ -165,7 +165,7 @@ class FileEditView(CanEditMixin, UpdateView):
         return modelform_factory(SithFile, fields=fields)
 
     def get_success_url(self):
-        if self.kwargs["popup"]:
+        if self.kwargs.get("popup") is not None:
             return reverse(
                 "core:file_detail", kwargs={"file_id": self.object.id, "popup": "popup"}
             )
@@ -176,7 +176,7 @@ class FileEditView(CanEditMixin, UpdateView):
     def get_context_data(self, **kwargs):
         kwargs = super(FileEditView, self).get_context_data(**kwargs)
         kwargs["popup"] = ""
-        if self.kwargs["popup"]:
+        if self.kwargs.get("popup") is not None:
             kwargs["popup"] = "popup"
         return kwargs
 
@@ -217,13 +217,13 @@ class FileEditPropView(CanEditPropMixin, UpdateView):
     def get_success_url(self):
         return reverse(
             "core:file_detail",
-            kwargs={"file_id": self.object.id, "popup": self.kwargs["popup"] or ""},
+            kwargs={"file_id": self.object.id, "popup": self.kwargs.get("popup", "")},
         )
 
     def get_context_data(self, **kwargs):
         kwargs = super(FileEditPropView, self).get_context_data(**kwargs)
         kwargs["popup"] = ""
-        if self.kwargs["popup"]:
+        if self.kwargs.get("popup") is not None:
             kwargs["popup"] = "popup"
         return kwargs
 
@@ -301,14 +301,14 @@ class FileView(CanViewMixin, DetailView, FormMixin):
     def get_success_url(self):
         return reverse(
             "core:file_detail",
-            kwargs={"file_id": self.object.id, "popup": self.kwargs["popup"] or ""},
+            kwargs={"file_id": self.object.id, "popup": self.kwargs.get("popup", "")},
         )
 
     def get_context_data(self, **kwargs):
         kwargs = super(FileView, self).get_context_data(**kwargs)
         kwargs["popup"] = ""
         kwargs["form"] = self.form
-        if self.kwargs["popup"]:
+        if self.kwargs.get("popup") is not None:
             kwargs["popup"] = "popup"
         kwargs["clipboard"] = SithFile.objects.filter(
             id__in=self.request.session["clipboard"]
@@ -328,20 +328,20 @@ class FileDeleteView(CanEditPropMixin, DeleteView):
             return self.request.GET["next"]
         if self.object.parent is None:
             return reverse(
-                "core:file_list", kwargs={"popup": self.kwargs["popup"] or ""}
+                "core:file_list", kwargs={"popup": self.kwargs.get("popup", "")}
             )
         return reverse(
             "core:file_detail",
             kwargs={
                 "file_id": self.object.parent.id,
-                "popup": self.kwargs["popup"] or "",
+                "popup": self.kwargs.get("popup", ""),
             },
         )
 
     def get_context_data(self, **kwargs):
         kwargs = super(FileDeleteView, self).get_context_data(**kwargs)
         kwargs["popup"] = ""
-        if self.kwargs["popup"]:
+        if self.kwargs.get("popup") is not None:
             kwargs["popup"] = "popup"
         return kwargs
 

core/views/forms.py

@@ -37,8 +37,8 @@ from django.forms import (
     DateTimeInput,
     Textarea,
 )
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext
 from phonenumber_field.widgets import PhoneNumberInternationalFallbackWidget
 from ajax_select.fields import AutoCompleteSelectField
 from ajax_select import make_ajax_field
@@ -130,7 +130,7 @@ class SelectFile(TextInput):
             '<span name="'
             + name
             + '" class="choose_file_button">'
-            + ugettext("Choose file")
+            + gettext("Choose file")
             + "</span>"
         )
         return output
@@ -154,7 +154,7 @@ class SelectUser(TextInput):
             '<span name="'
             + name
             + '" class="choose_user_button">'
-            + ugettext("Choose user")
+            + gettext("Choose user")
             + "</span>"
         )
         return output

core/views/group.py

@@ -31,7 +31,7 @@ from django.views.generic import ListView
 from django.views.generic.edit import FormView
 from django.urls import reverse_lazy
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django import forms
 
 from ajax_select.fields import AutoCompleteSelectMultipleField

core/views/user.py

@@ -27,7 +27,7 @@
 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.auth import views
 from django.contrib.auth.forms import PasswordChangeForm
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.urls import reverse
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.http import Http404, HttpResponse