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/userdbs/admin.py

@@ -6,12 +6,9 @@ from __future__ import absolute_import
 
 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 (
-    DatabaseUser,
-    UserDatabase,
-)
+from .models import DatabaseUser, UserDatabase
 
 
 class DatabaseUserCreationForm(forms.ModelForm):
@@ -23,7 +20,7 @@ class DatabaseUserCreationForm(forms.ModelForm):
 
     class Meta:
         model = DatabaseUser
-        fields = ['osuser', 'db_type']
+        fields = ["osuser", "db_type"]
 
     def save(self, commit=True):
         """
@@ -35,8 +32,10 @@ class DatabaseUserCreationForm(forms.ModelForm):
 
         """
         dbuser = DatabaseUser.objects.create_database_user(
-            osuser=self.cleaned_data['osuser'],
-            db_type=self.cleaned_data['db_type'], commit=commit)
+            osuser=self.cleaned_data["osuser"],
+            db_type=self.cleaned_data["db_type"],
+            commit=commit,
+        )
         return dbuser
 
     def save_m2m(self):
@@ -55,7 +54,7 @@ class UserDatabaseCreationForm(forms.ModelForm):
 
     class Meta:
         model = UserDatabase
-        fields = ['db_user']
+        fields = ["db_user"]
 
     def save(self, commit=True):
         """
@@ -67,7 +66,8 @@ class UserDatabaseCreationForm(forms.ModelForm):
 
         """
         database = UserDatabase.objects.create_userdatabase(
-            db_user=self.cleaned_data['db_user'], commit=commit)
+            db_user=self.cleaned_data["db_user"], commit=commit
+        )
         return database
 
     def save_m2m(self):
@@ -83,7 +83,8 @@ class DatabaseUserAdmin(admin.ModelAdmin):
     <userdbs.models.DatabaseUser>`
 
     """
-    actions = ['perform_delete_selected']
+
+    actions = ["perform_delete_selected"]
     add_form = DatabaseUserCreationForm
 
     def get_form(self, request, obj=None, **kwargs):
@@ -101,12 +102,13 @@ class DatabaseUserAdmin(admin.ModelAdmin):
         """
         defaults = {}
         if obj is None:
-            defaults.update({
-                'form': self.add_form,
-            })
+            defaults.update(
+                {
+                    "form": self.add_form,
+                }
+            )
         defaults.update(kwargs)
-        return super(DatabaseUserAdmin, self).get_form(
-            request, obj, **defaults)
+        return super(DatabaseUserAdmin, self).get_form(request, obj, **defaults)
 
     def get_readonly_fields(self, request, obj=None):
         """
@@ -122,7 +124,7 @@ class DatabaseUserAdmin(admin.ModelAdmin):
 
         """
         if obj:
-            return ['osuser', 'name', 'db_type']
+            return ["osuser", "name", "db_type"]
         return []
 
     def save_model(self, request, obj, form, change):
@@ -154,8 +156,8 @@ class DatabaseUserAdmin(admin.ModelAdmin):
         """
         for dbuser in queryset.all():
             dbuser.delete()
-    perform_delete_selected.short_description = _(
-        'Delete selected database users')
+
+    perform_delete_selected.short_description = _("Delete selected database users")
 
     def get_actions(self, request):
         """
@@ -170,8 +172,8 @@ class DatabaseUserAdmin(admin.ModelAdmin):
 
         """
         actions = super(DatabaseUserAdmin, self).get_actions(request)
-        if 'delete_selected' in actions:  # pragma: no cover
-            del actions['delete_selected']
+        if "delete_selected" in actions:  # pragma: no cover
+            del actions["delete_selected"]
         return actions
 
 
@@ -181,7 +183,8 @@ class UserDatabaseAdmin(admin.ModelAdmin):
     <userdbs.models.UserDatabase>`
 
     """
-    actions = ['perform_delete_selected']
+
+    actions = ["perform_delete_selected"]
     add_form = UserDatabaseCreationForm
 
     def get_form(self, request, obj=None, **kwargs):
@@ -199,12 +202,13 @@ class UserDatabaseAdmin(admin.ModelAdmin):
         """
         defaults = {}
         if obj is None:
-            defaults.update({
-                'form': self.add_form,
-            })
+            defaults.update(
+                {
+                    "form": self.add_form,
+                }
+            )
         defaults.update(kwargs)
-        return super(UserDatabaseAdmin, self).get_form(
-            request, obj, **defaults)
+        return super(UserDatabaseAdmin, self).get_form(request, obj, **defaults)
 
     def get_readonly_fields(self, request, obj=None):
         """
@@ -220,7 +224,7 @@ class UserDatabaseAdmin(admin.ModelAdmin):
 
         """
         if obj:
-            return ['db_name', 'db_user']
+            return ["db_name", "db_user"]
         return []
 
     def save_model(self, request, obj, form, change):
@@ -252,8 +256,8 @@ class UserDatabaseAdmin(admin.ModelAdmin):
         """
         for database in queryset.all():
             database.delete()
-    perform_delete_selected.short_description = _(
-        'Delete selected user databases')
+
+    perform_delete_selected.short_description = _("Delete selected user databases")
 
     def get_actions(self, request):
         """
@@ -268,8 +272,8 @@ class UserDatabaseAdmin(admin.ModelAdmin):
 
         """
         actions = super(UserDatabaseAdmin, self).get_actions(request)
-        if 'delete_selected' in actions:  # pragma: no cover
-            del actions['delete_selected']
+        if "delete_selected" in actions:  # pragma: no cover
+            del actions["delete_selected"]
         return actions