let pre-commit do some work

allianceauth/services/admin.py

@@ -66,6 +66,8 @@ class NameFormatConfigAdmin(admin.ModelAdmin):
     form = NameFormatConfigForm
     list_display = ('service_name', 'get_state_display_string')
 
+    @admin.display(
+        description='States'
+    )
     def get_state_display_string(self, obj):
         return ', '.join([state.name for state in obj.states.all()])
-    get_state_display_string.short_description = 'States'

allianceauth/services/hooks.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import re_path
 from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string

allianceauth/services/modules/discord/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/modules/example/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 app_name = 'example'

allianceauth/services/modules/ips4/admin.py

@@ -2,8 +2,7 @@ from django.contrib import admin
 from .models import Ips4User
 
 
+@admin.register(Ips4User)
 class Ips4UserAdmin(admin.ModelAdmin):
         list_display = ('user', 'username', 'id')
         search_fields = ('user__username', 'username', 'id')
-
-admin.site.register(Ips4User, Ips4UserAdmin)

allianceauth/services/modules/ips4/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/modules/mumble/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/modules/openfire/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/modules/phpbb3/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/modules/smf/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/modules/teamspeak3/admin.py

@@ -36,10 +36,12 @@ class AuthTSgroupAdmin(admin.ModelAdmin):
             kwargs['queryset'] = TSgroup.objects.exclude(ts_group_name__in=ReservedGroupName.objects.values_list('name', flat=True))
         return super().formfield_for_manytomany(db_field, request, **kwargs)
 
+    @admin.display(
+        description='ts groups'
+    )
     def _ts_group(self, obj):
         return [x for x in obj.ts_group.all().order_by('ts_group_id')]
 
-    _ts_group.short_description = 'ts groups'
     # _ts_group.admin_order_field = 'profile__state'
 
 

allianceauth/services/modules/teamspeak3/tests.py

@@ -462,12 +462,12 @@ class Teamspeak3AdminTestCase(TestCase):
     def test_field_queryset_no_reserved_names(self):
         """Ensure all groups are listed when no reserved names"""
         form = self.admin.get_form(request)
-        self.assertQuerysetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.all())
-        self.assertQuerysetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.all())
+        self.assertQuerySetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.all())
+        self.assertQuerySetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.all())
 
     def test_field_queryset_reserved_names(self):
         """Ensure reserved group names are filtered out"""
         ReservedGroupName.objects.bulk_create([ReservedGroupName(name='test', reason='tests', created_by='Bob')])
         form = self.admin.get_form(request)
-        self.assertQuerysetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.none())
-        self.assertQuerysetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.none())
+        self.assertQuerySetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.none())
+        self.assertQuerySetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.none())

allianceauth/services/modules/teamspeak3/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/modules/xenforo/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path
 
 from . import views

allianceauth/services/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.urls import include
 from allianceauth.hooks import get_hooks
 from django.urls import path