Merge branch 'django4' into 'v3.x'

dropin replace sleeksmpp with slixmpp, alter test

See merge request allianceauth/allianceauth!1399

allianceauth/analytics/tests/test_middleware.py

@@ -1,5 +1,6 @@
 from allianceauth.analytics.middleware import AnalyticsMiddleware
 from unittest.mock import Mock
+from django.http import HttpResponse
 
 from django.test.testcases import TestCase
 
@@ -7,7 +8,7 @@ from django.test.testcases import TestCase
 class TestAnalyticsMiddleware(TestCase):
 
     def setUp(self):
-        self.middleware = AnalyticsMiddleware()
+        self.middleware = AnalyticsMiddleware(HttpResponse)
         self.request = Mock()
         self.request.headers = {
                 "User-Agent": "AUTOMATED TEST"

allianceauth/services/modules/openfire/manager.py

@@ -3,7 +3,7 @@ import random
 import string
 from urllib.parse import urlparse
 
-import sleekxmpp
+import slixmpp
 from django.conf import settings
 from ofrestapi.users import Users as ofUsers
 from ofrestapi import exception
@@ -172,13 +172,13 @@ class OpenfireManager:
             raise PingBotException("Unable to connect to jabber server.")
 
 
-class PingBot(sleekxmpp.ClientXMPP):
+class PingBot(slixmpp.ClientXMPP):
     """
     A copy-paste of the example client bot from
     http://sleekxmpp.com/getting_started/sendlogout.html
     """
     def __init__(self, jid, password, recipient, message):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)
 
         self.reconnect_max_attempts = 5
         self.auto_reconnect = False

setup.py

@@ -30,7 +30,7 @@ install_requires = [
     'django-celery-beat @ git+https://github.com/celery/django-celery-beat.git',
 
     'openfire-restapi',
-    'sleekxmpp',
+    'slixmpp',
     'pydiscourse',
 
     'django-esi @ git+https://gitlab.com/soratidus999/django-esi.git@py310',