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/osusers/signals.py

@@ -6,14 +6,11 @@ The module starts Celery_ tasks.
 .. _Celery: http://www.celeryproject.org/
 
 """
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import
 
 import logging
 
-from django.db.models.signals import (
-    post_delete,
-    post_save,
-)
+from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 
 from fileservertasks.tasks import (
@@ -34,14 +31,7 @@ from ldaptasks.tasks import (
 )
 from taskresults.models import TaskResult
 
-from .models import (
-    AdditionalGroup,
-    Group,
-    SshPublicKey,
-    User,
-    password_set,
-)
-
+from .models import AdditionalGroup, Group, SshPublicKey, User, password_set
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -76,11 +66,12 @@ def handle_user_password_set(sender, instance, password, **kwargs):
         }
     """
     taskresult = TaskResult.objects.create_task_result(
-        'handle_user_password_set',
-        set_ldap_user_password.s(instance.username, password))
+        "handle_user_password_set",
+        set_ldap_user_password.s(instance.username, password),
+    )
     _LOGGER.info(
-        'LDAP password change has been requested in task %s',
-        taskresult.task_id)
+        "LDAP password change has been requested in task %s", taskresult.task_id
+    )
 
 
 @receiver(post_save, sender=Group)
@@ -114,14 +105,13 @@ def handle_group_created(sender, instance, created, **kwargs):
     """
     if created:
         taskresult = TaskResult.objects.create_task_result(
-            'handle_group_created',
-            create_ldap_group.s(
-                instance.groupname, instance.gid, instance.descr))
+            "handle_group_created",
+            create_ldap_group.s(instance.groupname, instance.gid, instance.descr),
+        )
         _LOGGER.info(
-            'LDAP group creation has been requested in task %s',
-            taskresult.task_id)
-    _LOGGER.debug(
-        'group %s has been %s', instance, created and "created" or "updated")
+            "LDAP group creation has been requested in task %s", taskresult.task_id
+        )
+    _LOGGER.debug("group %s has been %s", instance, created and "created" or "updated")
 
 
 @receiver(post_save, sender=User)
@@ -167,18 +157,24 @@ def handle_user_created(sender, instance, created, **kwargs):
 
     """
     if created:
-        chain = create_ldap_user.s(
-            instance.username, instance.uid, instance.group.gid,
-            instance.gecos, instance.homedir, instance.shell, None
-        ) | setup_file_sftp_userdir_chained.s() | (
-            setup_file_mail_userdir_chained.s())
-        taskresult = TaskResult.objects.create_task_result(
-            'handle_user_created', chain)
+        chain = (
+            create_ldap_user.s(
+                instance.username,
+                instance.uid,
+                instance.group.gid,
+                instance.gecos,
+                instance.homedir,
+                instance.shell,
+                None,
+            )
+            | setup_file_sftp_userdir_chained.s()
+            | (setup_file_mail_userdir_chained.s())
+        )
+        taskresult = TaskResult.objects.create_task_result("handle_user_created", chain)
         _LOGGER.info(
-            'LDAP user creation has been requested in task %s',
-            taskresult.task_id)
-    _LOGGER.debug(
-        'user %s has been %s', instance, created and "created" or "updated")
+            "LDAP user creation has been requested in task %s", taskresult.task_id
+        )
+    _LOGGER.debug("user %s has been %s", instance, created and "created" or "updated")
 
 
 @receiver(post_save, sender=AdditionalGroup)
@@ -213,12 +209,13 @@ def handle_user_added_to_group(sender, instance, created, **kwargs):
     """
     if created:
         taskresult = TaskResult.objects.create_task_result(
-            'handle_user_added_to_group',
-            add_ldap_user_to_group.s(
-                instance.user.username, instance.group.groupname))
+            "handle_user_added_to_group",
+            add_ldap_user_to_group.s(instance.user.username, instance.group.groupname),
+        )
         _LOGGER.info(
-            'Adding user to LDAP group has been requested in task %s',
-            taskresult.task_id)
+            "Adding user to LDAP group has been requested in task %s",
+            taskresult.task_id,
+        )
 
 
 @receiver(post_save, sender=SshPublicKey)
@@ -252,14 +249,11 @@ def handle_ssh_keys_changed(sender, instance, **kwargs):
 
     """
     sig = set_file_ssh_authorized_keys.s(
-        instance.user.username, [
-            str(key) for key in
-            SshPublicKey.objects.filter(user=instance.user)])
-    taskresult = TaskResult.objects.create_task_result(
-        'handle_ssh_keys_changed', sig)
-    _LOGGER.info(
-        'Change of SSH keys has been requested in task %s',
-        taskresult.task_id)
+        instance.user.username,
+        [str(key) for key in SshPublicKey.objects.filter(user=instance.user)],
+    )
+    taskresult = TaskResult.objects.create_task_result("handle_ssh_keys_changed", sig)
+    _LOGGER.info("Change of SSH keys has been requested in task %s", taskresult.task_id)
 
 
 # @receiver(post_delete)
@@ -299,11 +293,11 @@ def handle_group_deleted(sender, instance, **kwargs):
 
     """
     taskresult = TaskResult.objects.create_task_result(
-        'handle_group_deleted',
-        delete_ldap_group.s(instance.groupname))
+        "handle_group_deleted", delete_ldap_group.s(instance.groupname)
+    )
     _LOGGER.info(
-        'LDAP group deletion has been requested in task %s',
-        taskresult.task_id)
+        "LDAP group deletion has been requested in task %s", taskresult.task_id
+    )
 
 
 @receiver(post_delete, sender=User)
@@ -348,15 +342,14 @@ def handle_user_deleted(sender, instance, **kwargs):
         }
 
     """
-    chain = delete_file_mail_userdir.s(
-        instance.username
-    ) | delete_file_sftp_userdir_chained.s() | delete_ldap_user_chained.s()
-    _LOGGER.debug('chain signature %s', chain)
-    taskresult = TaskResult.objects.create_task_result(
-        'handle_user_deleted', chain)
-    _LOGGER.info(
-        'LDAP user deletion has been requested in task %s',
-        taskresult.task_id)
+    chain = (
+        delete_file_mail_userdir.s(instance.username)
+        | delete_file_sftp_userdir_chained.s()
+        | delete_ldap_user_chained.s()
+    )
+    _LOGGER.debug("chain signature %s", chain)
+    taskresult = TaskResult.objects.create_task_result("handle_user_deleted", chain)
+    _LOGGER.info("LDAP user deletion has been requested in task %s", taskresult.task_id)
 
 
 @receiver(post_delete, sender=AdditionalGroup)
@@ -393,9 +386,10 @@ def handle_user_removed_from_group(sender, instance, **kwargs):
 
     """
     taskresult = TaskResult.objects.create_task_result(
-        'handle_user_removed_from_group',
-        remove_ldap_user_from_group.s(
-            instance.user.username, instance.group.groupname))
+        "handle_user_removed_from_group",
+        remove_ldap_user_from_group.s(instance.user.username, instance.group.groupname),
+    )
     _LOGGER.info(
-        'Removing user from LDAP group has been requested in task %s',
-        taskresult.task_id)
+        "Removing user from LDAP group has been requested in task %s",
+        taskresult.task_id,
+    )