.git-blame-ignore-revs

@@ -1,6 +0,0 @@
-# git config blame.ignoreRevsFile .git-blame-ignore-revs
-
-
-
-# Ruff initial formatting storm
-a99315ea55339f0b6010b5c9d8703e51278fcf29

.gitignore

@@ -71,7 +71,6 @@ celerybeat-schedule
 
 #other
 .flake8
-.ruff_cache
 .pylintrc
 Makefile
 alliance_auth.sqlite3

.pre-commit-config.yaml

@@ -4,14 +4,14 @@
 #   pre-commit autoupdate
 
 repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
+  # Code Upgrades
-    rev: v0.6.4
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.2
     hooks:
-      # Run the linter, and only the linter
+      - id: pyupgrade
-      - id: ruff
+        args: [--py310-plus]
-
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.21.0
+    rev: 1.17.0
     hooks:
       - id: django-upgrade
         args: [--target-version=4.2]
@@ -63,7 +63,7 @@ repos:
             swagger\.json
           )
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 3.0.3
+    rev: 2.7.3
     hooks:
       - id: editorconfig-checker
         exclude: |
@@ -82,7 +82,7 @@ repos:
           - --disable=MD013
   # Infrastructure
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 2.2.3
+    rev: 2.1.3
     hooks:
       - id: pyproject-fmt
         name: pyproject.toml formatter
@@ -90,9 +90,9 @@ repos:
         args:
           - --indent=4
         additional_dependencies:
-          - tox==4.18.1 # https://github.com/tox-dev/tox/releases/latest
+          - tox==4.15.0 # https://github.com/tox-dev/tox/releases/latest
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.19
+    rev: v0.18
     hooks:
       - id: validate-pyproject
         name: Validate pyproject.toml

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.3.1'
+__version__ = '4.2.2'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/analytics/migrations/0001_initial.py

@@ -1,8 +1,7 @@
 # Generated by Django 3.1.4 on 2020-12-30 13:11
 
-import uuid
-
 from django.db import migrations, models
+import uuid
 
 
 class Migration(migrations.Migration):

allianceauth/analytics/migrations/0002_add_AA_Team_Token.py

@@ -21,7 +21,7 @@ def remove_aa_team_token(apps, schema_editor):
     # Have to define some code to remove this identifier
     # In case of migration rollback?
     Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    Tokens.objects.filter(token="UA-186249766-2").delete()
+    token = Tokens.objects.filter(token="UA-186249766-2").delete()
 
 
 class Migration(migrations.Migration):

allianceauth/analytics/migrations/0003_Generate_Identifier.py

@@ -1,5 +1,6 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53
 
+from uuid import uuid4
 from django.db import migrations
 
 

allianceauth/analytics/migrations/0008_add_AA_GA-4_Team_Token .py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.4 on 2020-12-30 08:53
 
-from django.core.exceptions import ObjectDoesNotExist
 from django.db import migrations
+from django.core.exceptions import ObjectDoesNotExist
 
 
 def add_aa_team_token(apps, schema_editor):
@@ -51,7 +51,7 @@ def remove_aa_team_token(apps, schema_editor):
     # Have to define some code to remove this identifier
     # In case of migration rollback?
     Tokens = apps.get_model('analytics', 'AnalyticsTokens')
-    Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
+    token = Tokens.objects.filter(token="G-6LYSMYK8DE").delete()
 
 
 class Migration(migrations.Migration):

allianceauth/analytics/models.py

@@ -1,9 +1,9 @@
-from uuid import uuid4
-
-from django.core.exceptions import ValidationError
 from django.db import models
+from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
+from uuid import uuid4
+
 
 class AnalyticsIdentifier(models.Model):
 
@@ -11,9 +11,6 @@ class AnalyticsIdentifier(models.Model):
         default=uuid4,
         editable=False)
 
-    def __str__(self) -> str:
-        return f"{self.identifier}"
-
     def save(self, *args, **kwargs):
         if not self.pk and AnalyticsIdentifier.objects.exists():
             # Force a single object
@@ -34,6 +31,3 @@ class AnalyticsTokens(models.Model):
     token = models.CharField(max_length=254, blank=False)
     secret = models.CharField(max_length=254, blank=True)
     send_stats = models.BooleanField(default=False)
-
-    def __str__(self) -> str:
-        return self.name

allianceauth/analytics/tasks.py

@@ -1,16 +1,16 @@
-import logging
-
 import requests
-from celery import shared_task
+import logging
-
-from django.apps import apps
 from django.conf import settings
+from django.apps import apps
+from celery import shared_task
+from .models import AnalyticsTokens, AnalyticsIdentifier
+from .utils import (
+    install_stat_addons,
+    install_stat_tokens,
+    install_stat_users)
 
 from allianceauth import __version__
 
-from .models import AnalyticsIdentifier, AnalyticsTokens
-from .utils import install_stat_addons, install_stat_tokens, install_stat_users
-
 logger = logging.getLogger(__name__)
 
 BASE_URL = "https://www.google-analytics.com"

allianceauth/analytics/tests/test_models.py

@@ -1,9 +1,10 @@
-from uuid import UUID, uuid4
+from allianceauth.analytics.models import AnalyticsIdentifier
-
 from django.core.exceptions import ValidationError
+
 from django.test.testcases import TestCase
 
-from allianceauth.analytics.models import AnalyticsIdentifier
+from uuid import UUID, uuid4
+
 
 # Identifiers
 uuid_1 = "ab33e241fbf042b6aa77c7655a768af7"

allianceauth/analytics/tests/test_tasks.py

@@ -2,9 +2,12 @@ import requests_mock
 
 from django.test.utils import override_settings
 
-from allianceauth.analytics.tasks import analytics_event, send_ga_tracking_celery_event
+from allianceauth.analytics.tasks import (
+    analytics_event,
+    send_ga_tracking_celery_event)
 from allianceauth.utils.testing import NoSocketsTestCase
 
+
 GOOGLE_ANALYTICS_DEBUG_URL = 'https://www.google-analytics.com/debug/mp/collect'
 
 

allianceauth/analytics/tests/test_utils.py

@@ -1,8 +1,9 @@
 from django.apps import apps
-from django.test.testcases import TestCase
-
-from allianceauth.analytics.utils import install_stat_addons, install_stat_users
 from allianceauth.authentication.models import User
+from esi.models import Token
+from allianceauth.analytics.utils import install_stat_users, install_stat_tokens, install_stat_addons
+
+from django.test.testcases import TestCase
 
 
 def create_testdata():

allianceauth/analytics/utils.py

@@ -1,8 +1,6 @@
 from django.apps import apps
-
-from esi.models import Token
-
 from allianceauth.authentication.models import User
+from esi.models import Token
 
 
 def install_stat_users() -> int:

allianceauth/apps.py

@@ -1,4 +1,5 @@
 from django.apps import AppConfig
+from django.core.checks import Warning, Error, register
 
 
 class AllianceAuthConfig(AppConfig):

allianceauth/authentication/admin.py

@@ -1,21 +1,43 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import Group, Permission as BasePermission, User as BaseUser
+from django.contrib.auth.models import Group
+from django.contrib.auth.models import Permission as BasePermission
+from django.contrib.auth.models import User as BaseUser
 from django.db.models import Count, Q
 from django.db.models.functions import Lower
-from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
+from django.db.models.signals import (
+    m2m_changed,
+    post_delete,
+    post_save,
+    pre_delete,
+    pre_save
+)
 from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.text import slugify
 
-from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
+from allianceauth.authentication.models import (
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+    CharacterOwnership,
+    OwnershipRecord,
+    State,
+    UserProfile,
+    get_guest_state
+)
+from allianceauth.eveonline.models import (
+    EveAllianceInfo,
+    EveCharacter,
+    EveCorporationInfo,
+    EveFactionInfo
+)
 from allianceauth.eveonline.tasks import update_character
 from allianceauth.hooks import get_hooks
 from allianceauth.services.hooks import ServicesHook
 
-from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_CHARS, AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
+from .app_settings import (
+    AUTHENTICATION_ADMIN_USERS_MAX_CHARS,
+    AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
+)
 from .forms import UserChangeForm, UserProfileForm
 
 
@@ -110,7 +132,10 @@ def user_username(obj):
     To be used for all user based admin lists
     """
     link = reverse(
-        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label,
+            type(obj).__name__.lower()
+        ),
         args=(obj.pk,)
     )
     user_obj = obj.user if hasattr(obj, 'user') else obj
@@ -523,7 +548,7 @@ class BaseOwnershipAdmin(admin.ModelAdmin):
     def get_readonly_fields(self, request, obj=None):
         if obj and obj.pk:
             return 'owner_hash', 'character'
-        return ()
+        return tuple()
 
 
 @admin.register(OwnershipRecord)

allianceauth/authentication/app_settings.py

@@ -25,7 +25,7 @@ def _clean_setting(
     if not required_type:
         required_type = type(default_value)
 
-    if min_value is None and required_type is int:
+    if min_value is None and required_type == int:
         min_value = 0
 
     if (hasattr(settings, name)

allianceauth/authentication/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.core.checks import Tags, register
+from django.core.checks import register, Tags
 
 
 class AuthenticationConfig(AppConfig):

allianceauth/authentication/auth_hooks.py

@@ -1,7 +1,6 @@
-from allianceauth import hooks
 from allianceauth.hooks import DashboardItemHook
-
+from allianceauth import hooks
-from .views import dashboard_admin, dashboard_characters, dashboard_esi_check, dashboard_groups
+from .views import dashboard_characters, dashboard_esi_check, dashboard_groups, dashboard_admin
 
 
 class UserCharactersHook(DashboardItemHook):

allianceauth/authentication/backends.py

@@ -1,9 +1,10 @@
 import logging
 
 from django.contrib.auth.backends import ModelBackend
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User, Permission
+
+from .models import UserProfile, CharacterOwnership, OwnershipRecord
 
-from .models import CharacterOwnership, OwnershipRecord, UserProfile
 
 logger = logging.getLogger(__name__)
 

allianceauth/authentication/checks.py

@@ -1,5 +1,5 @@
-from django.conf import settings
 from django.core.checks import Error
+from django.conf import settings
 
 
 def check_login_scopes_setting(*args, **kwargs):

allianceauth/authentication/core/celery_workers.py

@@ -2,6 +2,7 @@
 
 import itertools
 import logging
+from typing import Optional
 
 from amqp.exceptions import ChannelError
 from celery import current_app

allianceauth/authentication/decorators.py

@@ -1,11 +1,15 @@
-from collections.abc import Callable, Iterable
+from django.urls import include
+from django.contrib.auth.decorators import user_passes_test
+from django.core.exceptions import PermissionDenied
 from functools import wraps
+from typing import Optional
+from collections.abc import Callable, Iterable
 
+from django.urls import include
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect
-from django.urls import include
 from django.utils.translation import gettext_lazy as _
 
 

allianceauth/authentication/forms.py

@@ -60,7 +60,7 @@ class UserChangeForm(BaseUserChangeForm):
                     {
                         "groups": _(
                             "You are not allowed to add or remove these "
-                            "restricted groups: {}".format(restricted_names)
+                            "restricted groups: %s" % restricted_names
                         )
                     }
                 )

allianceauth/authentication/hmac_urls.py

@@ -1,6 +1,5 @@
-from django.urls import include, path, re_path
-
 from allianceauth.authentication import views
+from django.urls import include, re_path, path
 
 urlpatterns = [
     path('activate/complete/', views.activation_complete, name='registration_activation_complete'),

allianceauth/authentication/management/commands/checkmains.py

@@ -1,5 +1,4 @@
 from django.core.management.base import BaseCommand
-
 from allianceauth.authentication.models import UserProfile
 
 
@@ -12,7 +11,8 @@ class Command(BaseCommand):
         if profiles.exists():
             for profile in profiles:
                 self.stdout.write(self.style.ERROR(
-                    f'{profile.main_character} does not have an ownership. Resetting user {profile.user} main character.'))
+                    '{} does not have an ownership. Resetting user {} main character.'.format(profile.main_character,
+                                                                                                profile.user)))
                 profile.main_character = None
                 profile.save()
             self.stdout.write(self.style.WARNING(f'Reset {profiles.count()} main characters.'))

allianceauth/authentication/managers.py

@@ -1,7 +1,7 @@
 import logging
 
 from django.db import transaction
-from django.db.models import Manager, Q, QuerySet
+from django.db.models import Manager, QuerySet, Q
 
 from allianceauth.eveonline.models import EveCharacter
 

allianceauth/authentication/middleware.py

@@ -1,8 +1,8 @@
-import logging
-
 from django.conf import settings
 from django.utils.deprecation import MiddlewareMixin
 
+import logging
+
 logger = logging.getLogger(__name__)
 
 

allianceauth/authentication/migrations/0001_initial.py

@@ -1,8 +1,8 @@
 # Generated by Django 1.10.1 on 2016-09-05 21:38
 
-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allianceauth/authentication/migrations/0004_create_permissions.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations
 
-
 def create_permissions(apps, schema_editor):
     User = apps.get_model('auth', 'User')
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0005_delete_perms.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations
 
-
 def delete_permissions(apps, schema_editor):
     User = apps.get_model('auth', 'User')
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0010_only_one_authservicesinfo.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations
 
-
 def count_completed_fields(model):
     return len([True for key, value in model.__dict__.items() if bool(value)])
 

allianceauth/authentication/migrations/0011_authservicesinfo_user_onetoonefield.py

@@ -1,8 +1,8 @@
 # Generated by Django 1.10.1 on 2017-01-07 07:11
 
-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allianceauth/authentication/migrations/0012_remove_add_delete_authservicesinfo_permissions.py

@@ -1,7 +1,6 @@
 # Generated by Django 1.10.5 on 2017-01-12 00:59
 
-from django.db import migrations
+from django.db import migrations, models
-
 
 def remove_permissions(apps, schema_editor):
     ContentType = apps.get_model('contenttypes', 'ContentType')

allianceauth/authentication/migrations/0013_service_modules.py

@@ -1,9 +1,9 @@
 # Generated by Django 1.10.2 on 2016-12-11 23:14
 
-import logging
-
 from django.db import migrations
 
+import logging
+
 logger = logging.getLogger(__name__)
 
 

allianceauth/authentication/migrations/0015_user_profiles.py

@@ -1,12 +1,11 @@
 # Generated by Django 1.10.5 on 2017-03-22 23:09
 
+import allianceauth.authentication.models
 import django.db.models.deletion
 from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.db import migrations, models
 
-import allianceauth.authentication.models
-
 
 def create_guest_state(apps, schema_editor):
     State = apps.get_model('authentication', 'State')

allianceauth/authentication/migrations/0016_ownershiprecord.py

@@ -1,8 +1,8 @@
 # Generated by Django 2.0.4 on 2018-04-14 18:28
 
-import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 def create_initial_records(apps, schema_editor):

allianceauth/authentication/migrations/0024_alter_userprofile_language.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2 on 2024-09-13 09:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authentication', '0023_alter_userprofile_language'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='userprofile',
-            name='language',
-            field=models.CharField(blank=True, choices=[('en', 'English'), ('cs-cz', 'Czech'), ('de', 'German'), ('es', 'Spanish'), ('it-it', 'Italian'), ('ja', 'Japanese'), ('ko-kr', 'Korean'), ('fr-fr', 'French'), ('ru', 'Russian'), ('nl-nl', 'Dutch'), ('pl-pl', 'Polish'), ('uk', 'Ukrainian'), ('zh-hans', 'Simplified Chinese')], default='', max_length=10, verbose_name='Language'),
-        ),
-    ]

allianceauth/authentication/models.py

@@ -1,11 +1,11 @@
 import logging
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User, Permission
 from django.db import models, transaction
 from django.utils.translation import gettext_lazy as _
-
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from allianceauth.notifications import notify
+from django.conf import settings
 
 from .managers import CharacterOwnershipManager, StateManager
 
@@ -60,26 +60,25 @@ def get_guest_state_pk():
 
 
 class UserProfile(models.Model):
-
+    class Meta:
+        default_permissions = ('change',)
 
     class Language(models.TextChoices):
         """
         Choices for UserProfile.language
         """
-        # Sorted by Language Code alphabetical order + English at top
+
         ENGLISH = 'en', _('English')
-        CZECH = 'cs-cz', _("Czech")  # Not yet at 50% translated
         GERMAN = 'de', _('German')
         SPANISH = 'es', _('Spanish')
-        ITALIAN = 'it-it', _('Italian')
+        CHINESE = 'zh-hans', _('Chinese Simplified')
-        JAPANESE = 'ja', _('Japanese')
-        KOREAN = 'ko-kr', _('Korean')
-        FRENCH = 'fr-fr', _('French')
         RUSSIAN = 'ru', _('Russian')
-        DUTCH = 'nl-nl', _("Dutch")
+        KOREAN = 'ko', _('Korean')
-        POLISH = 'pl-pl', _("Polish")
+        FRENCH = 'fr', _('French')
+        JAPANESE = 'ja', _('Japanese')
+        ITALIAN = 'it', _('Italian')
         UKRAINIAN = 'uk', _('Ukrainian')
-        CHINESE = 'zh-hans', _('Simplified Chinese')
+        POLISH = 'pl', _("Polish")
 
     user = models.OneToOneField(
         User,
@@ -107,15 +106,10 @@ class UserProfile(models.Model):
         _("Theme"),
         max_length=200,
         blank=True,
+        null=True,
         help_text="Bootstrap 5 Themes from https://bootswatch.com/ or Community Apps"
     )
 
-    class Meta:
-        default_permissions = ('change',)
-
-    def __str__(self) -> str:
-        return str(self.user)
-
     def assign_state(self, state=None, commit=True):
         if not state:
             state = State.objects.get_for_user(self.user)
@@ -126,7 +120,7 @@ class UserProfile(models.Model):
                 self.save(update_fields=['state'])
                 notify(
                     self.user,
-                    _('State changed to: {}'.format(state)),
+                    _('State changed to: %s' % state),
                     _('Your user\'s state is now: %(state)s')
                     % ({'state': state}),
                     'info'
@@ -141,18 +135,19 @@ class UserProfile(models.Model):
                     sender=self.__class__, user=self.user, state=self.state
                 )
 
-
+    def __str__(self):
+        return str(self.user)
 class CharacterOwnership(models.Model):
-
+    class Meta:
+        default_permissions = ('change', 'delete')
+        ordering = ['user', 'character__character_name']
 
     character = models.OneToOneField(EveCharacter, on_delete=models.CASCADE, related_name='character_ownership')
     owner_hash = models.CharField(max_length=28, unique=True)
     user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='character_ownerships')
 
     objects = CharacterOwnershipManager()
-    class Meta:
+
-        default_permissions = ('change', 'delete')
-        ordering = ['user', 'character__character_name']
     def __str__(self):
         return f"{self.user}: {self.character}"
 

allianceauth/authentication/signals.py

@@ -1,16 +1,19 @@
 import logging
 
+from .models import (
+    CharacterOwnership,
+    UserProfile,
+    get_guest_state,
+    State,
+    OwnershipRecord)
 from django.contrib.auth.models import User
 from django.db.models import Q
-from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete, pre_save
+from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
-from django.dispatch import Signal, receiver
+from django.dispatch import receiver, Signal
-
 from esi.models import Token
 
 from allianceauth.eveonline.models import EveCharacter
 
-from .models import CharacterOwnership, OwnershipRecord, State, UserProfile, get_guest_state
-
 logger = logging.getLogger(__name__)
 
 state_changed = Signal()
@@ -105,7 +108,8 @@ def record_character_ownership(sender, instance, created, *args, **kwargs):
 def validate_main_character(sender, instance, *args, **kwargs):
     try:
         if instance.user.profile.main_character == instance.character:
-            logger.info(f"Ownership of a main character {instance.character} has been revoked. Resetting {instance.user} main character.")
+            logger.info("Ownership of a main character {} has been revoked. Resetting {} main character.".format(
+                instance.character, instance.user))
             # clear main character as user no longer owns them
             instance.user.profile.main_character = None
             instance.user.profile.save()

allianceauth/authentication/task_statistics/counters.py

@@ -1,7 +1,7 @@
 """Counters for Task Statistics."""
 
 import datetime as dt
-from typing import NamedTuple
+from typing import NamedTuple, Optional
 
 from .event_series import EventSeries
 

allianceauth/authentication/task_statistics/event_series.py

@@ -2,6 +2,7 @@
 
 import datetime as dt
 import logging
+from typing import List, Optional
 
 from pytz import utc
 from redis import Redis

allianceauth/authentication/task_statistics/signals.py

@@ -1,11 +1,7 @@
 """Signals for Task Statistics."""
 
 from celery.signals import (
-    task_failure,
+    task_failure, task_internal_error, task_retry, task_success, worker_ready,
-    task_internal_error,
-    task_retry,
-    task_success,
-    worker_ready,
 )
 
 from django.conf import settings

allianceauth/authentication/task_statistics/tests/test_counters.py

@@ -4,10 +4,7 @@ from django.test import TestCase
 from django.utils.timezone import now
 
 from allianceauth.authentication.task_statistics.counters import (
-    dashboard_results,
+    dashboard_results, failed_tasks, retried_tasks, succeeded_tasks,
-    failed_tasks,
-    retried_tasks,
-    succeeded_tasks,
 )
 
 

allianceauth/authentication/task_statistics/tests/test_helpers.py

@@ -4,8 +4,7 @@ from unittest.mock import patch
 from redis import RedisError
 
 from allianceauth.authentication.task_statistics.helpers import (
-    _RedisStub,
+    _RedisStub, get_redis_client_or_stub,
-    get_redis_client_or_stub,
 )
 
 MODULE_PATH = "allianceauth.authentication.task_statistics.helpers"

allianceauth/authentication/task_statistics/tests/test_signals.py

@@ -10,8 +10,8 @@ from allianceauth.authentication.task_statistics.counters import (
     succeeded_tasks,
 )
 from allianceauth.authentication.task_statistics.signals import (
-    is_enabled,
     reset_counters,
+    is_enabled,
 )
 from allianceauth.eveonline.tasks import update_character
 

allianceauth/authentication/tasks.py

@@ -1,9 +1,8 @@
 import logging
 
-from celery import shared_task
+from esi.errors import TokenExpiredError, TokenInvalidError, IncompleteResponseError
-
-from esi.errors import IncompleteResponseError, TokenExpiredError, TokenInvalidError
 from esi.models import Token
+from celery import shared_task
 
 from allianceauth.authentication.models import CharacterOwnership
 
@@ -23,7 +22,8 @@ def check_character_ownership(owner_hash):
                 continue
             except (KeyError, IncompleteResponseError):
                 # We can't validate the hash hasn't changed but also can't assume it has. Abort for now.
-                logger.warning(f"Failed to validate owner hash of {tokens[0].character_name} due to problems contacting SSO servers.")
+                logger.warning("Failed to validate owner hash of {} due to problems contacting SSO servers.".format(
+                    tokens[0].character_name))
                 break
 
             if not t.character_owner_hash == old_hash:
@@ -33,7 +33,7 @@ def check_character_ownership(owner_hash):
             break
 
     if not Token.objects.filter(character_owner_hash=owner_hash).exists():
-        logger.info(f'No tokens found with owner hash {owner_hash}. Revoking ownership.')
+        logger.info('No tokens found with owner hash %s. Revoking ownership.' % owner_hash)
         CharacterOwnership.objects.filter(owner_hash=owner_hash).delete()
 
 

allianceauth/authentication/tests/__init__.py

@@ -1,6 +1,11 @@
-from unittest import mock
+from django.db.models.signals import (
-
+    m2m_changed,
+    post_save,
+    pre_delete,
+    pre_save
+)
 from django.urls import reverse
+from unittest import mock
 
 MODULE_PATH = 'allianceauth.authentication'
 
@@ -12,7 +17,9 @@ def patch(target, *args, **kwargs):
 def get_admin_change_view_url(obj: object) -> str:
     """returns URL to admin change view for given object"""
     return reverse(
-        f'admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change',
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label, type(obj).__name__.lower()
+        ),
         args=(obj.pk,)
     )
 

allianceauth/authentication/tests/core/test_celery_workers.py

@@ -5,8 +5,7 @@ from amqp.exceptions import ChannelError
 from django.test import TestCase
 
 from allianceauth.authentication.core.celery_workers import (
-    active_tasks_count,
+    active_tasks_count, queued_tasks_count,
-    queued_tasks_count,
 )
 
 MODULE_PATH = "allianceauth.authentication.core.celery_workers"

allianceauth/authentication/tests/test_admin.py

@@ -1,37 +1,42 @@
-from unittest.mock import MagicMock, patch
-from urllib.parse import quote
-
 from bs4 import BeautifulSoup
+from urllib.parse import quote
+from unittest.mock import patch, MagicMock
+
 from django_webtest import WebTest
 
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import Group
-from django.test import Client, RequestFactory, TestCase
+from django.test import TestCase, RequestFactory, Client
 
-from allianceauth.authentication.models import CharacterOwnership, OwnershipRecord, State
+from allianceauth.authentication.models import (
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
+    CharacterOwnership, State, OwnershipRecord
+)
+from allianceauth.eveonline.models import (
+    EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo
+)
 from allianceauth.services.hooks import ServicesHook
 from allianceauth.tests.auth_utils import AuthUtils
 
 from ..admin import (
     BaseUserAdmin,
     CharacterOwnershipAdmin,
-    MainAllianceFilter,
+    StateAdmin,
     MainCorporationsFilter,
+    MainAllianceFilter,
     MainFactionFilter,
     OwnershipRecordAdmin,
-    StateAdmin,
     User,
     UserAdmin,
-    make_service_hooks_sync_nickname_action,
-    make_service_hooks_update_groups_action,
-    update_main_character_model,
     user_main_organization,
     user_profile_pic,
     user_username,
+    update_main_character_model,
+    make_service_hooks_update_groups_action,
+    make_service_hooks_sync_nickname_action
 )
 from . import get_admin_change_view_url, get_admin_search_url
 
+
 MODULE_PATH = 'allianceauth.authentication.admin'
 
 
@@ -322,15 +327,15 @@ class TestUserAdmin(TestCaseWithTestData):
 
     def test_user_username_u1(self):
         expected = (
-            f'<strong><a href="/admin/authentication/user/{self.user_1.pk}/change/">'
+            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Bruce_Wayne</a></strong><br>Bruce Wayne'
+            'Bruce_Wayne</a></strong><br>Bruce Wayne'.format(self.user_1.pk)
         )
         self.assertEqual(user_username(self.user_1), expected)
 
     def test_user_username_u3(self):
         expected = (
-            f'<strong><a href="/admin/authentication/user/{self.user_3.pk}/change/">'
+            '<strong><a href="/admin/authentication/user/{}/change/">'
-            'Lex_Luthor</a></strong>'
+            'Lex_Luthor</a></strong>'.format(self.user_3.pk)
         )
         self.assertEqual(user_username(self.user_3), expected)
 

allianceauth/authentication/tests/test_app_settings.py

@@ -1,5 +1,4 @@
 from unittest.mock import Mock, patch
-
 from django.test import TestCase
 
 from .. import app_settings
@@ -84,7 +83,7 @@ class TestSetAppSetting(TestCase):
         self.assertEqual(result, 50)
 
     @patch(MODULE_PATH + '.app_settings.settings')
-    def test_default_for_outofrange_int(self, mock_settings):
+    def test_default_for_invalid_type_int(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = 1000
         result = app_settings._clean_setting(
             'TEST_SETTING_DUMMY',
@@ -97,7 +96,7 @@ class TestSetAppSetting(TestCase):
     def test_default_is_none_needs_required_type(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = 'invalid type'
         with self.assertRaises(ValueError):
-            app_settings._clean_setting(
+            result = app_settings._clean_setting(
                 'TEST_SETTING_DUMMY',
                 default_value=None
             )

allianceauth/authentication/tests/test_backend.py

@@ -1,13 +1,13 @@
-from django.contrib.auth.models import Group, User
+from django.contrib.auth.models import User, Group
 from django.test import TestCase
 
-from esi.models import Token
-
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.tests.auth_utils import AuthUtils
 
+from esi.models import Token
+
 from ..backends import StateBackend
-from ..models import CharacterOwnership, OwnershipRecord, UserProfile
+from ..models import CharacterOwnership, UserProfile, OwnershipRecord
 
 MODULE_PATH = 'allianceauth.authentication'
 

allianceauth/authentication/tests/test_decorators.py

@@ -6,11 +6,12 @@ from django.contrib.auth.models import AnonymousUser
 from django.http.response import HttpResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.urls import URLPattern, reverse
+from django.urls import reverse, URLPattern
 
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.tests.auth_utils import AuthUtils
 
+
 from ..decorators import decorate_url_patterns, main_character_required
 from ..models import CharacterOwnership
 
@@ -46,7 +47,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_login_redirect(self, m):
-        self.request.user = AnonymousUser()
+        setattr(self.request, 'user', AnonymousUser())
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 302)
         url = getattr(response, 'url', None)
@@ -54,7 +55,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_main_character_redirect(self, m):
-        self.request.user = self.no_main_user
+        setattr(self.request, 'user', self.no_main_user)
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 302)
         url = getattr(response, 'url', None)
@@ -62,7 +63,7 @@ class DecoratorTestCase(TestCase):
 
     @mock.patch(MODULE_PATH + '.decorators.messages')
     def test_successful_request(self, m):
-        self.request.user = self.main_user
+        setattr(self.request, 'user', self.main_user)
         response = self.dummy_view(self.request)
         self.assertEqual(response.status_code, 200)
 

allianceauth/authentication/tests/test_middleware.py

@@ -1,9 +1,9 @@
-from unittest.mock import Mock
+from unittest import mock
-
-from django.http import HttpResponse
-from django.test.testcases import TestCase
-
 from allianceauth.authentication.middleware import UserSettingsMiddleware
+from unittest.mock import Mock
+from django.http import HttpResponse
+
+from django.test.testcases import TestCase
 
 
 class TestUserSettingsMiddlewareSaveLang(TestCase):
@@ -39,7 +39,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         of a non-existent (anonymous) user
         """
         self.request.user.is_anonymous = True
-        self.middleware.process_response(
+        response = self.middleware.process_response(
             self.request,
             self.response
             )
@@ -52,7 +52,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         does the middleware change a language not set in the DB
         """
         self.request.user.profile.language = None
-        self.middleware.process_response(
+        response = self.middleware.process_response(
             self.request,
             self.response
             )
@@ -64,7 +64,7 @@ class TestUserSettingsMiddlewareSaveLang(TestCase):
         """
         Tests the middleware will change a language setting
         """
-        self.middleware.process_response(
+        response = self.middleware.process_response(
             self.request,
             self.response
             )
@@ -158,7 +158,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
         tests the middleware will set night_mode if not set
         """
         self.request.session = {}
-        self.middleware.process_response(
+        response = self.middleware.process_response(
             self.request,
             self.response
             )
@@ -168,7 +168,7 @@ class TestUserSettingsMiddlewareLoginFlow(TestCase):
         """
         tests the middleware will set night_mode if set.
         """
-        self.middleware.process_response(
+        response = self.middleware.process_response(
             self.request,
             self.response
             )

allianceauth/authentication/tests/test_models.py

@@ -3,12 +3,12 @@ from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\
+    EveAllianceInfo, EveFactionInfo
+from allianceauth.tests.auth_utils import AuthUtils
 from esi.errors import IncompleteResponseError
 from esi.models import Token
 
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
-from allianceauth.tests.auth_utils import AuthUtils
-
 from ..models import CharacterOwnership, State, get_guest_state
 from ..tasks import check_character_ownership
 

allianceauth/authentication/tests/test_signals.py

@@ -1,11 +1,19 @@
-
-from django.db.models.signals import post_save
-from django.test.testcases import TestCase
-
 from allianceauth.authentication.models import User, UserProfile
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
+from allianceauth.eveonline.models import (
+    EveCharacter,
+    EveCorporationInfo,
+    EveAllianceInfo
+)
+from django.db.models.signals import (
+    pre_save,
+    post_save,
+    pre_delete,
+    m2m_changed
+)
 from allianceauth.tests.auth_utils import AuthUtils
 
+from django.test.testcases import TestCase
+from unittest.mock import Mock
 from . import patch
 
 

allianceauth/authentication/tests/test_templatetags.py

@@ -9,12 +9,8 @@ from django.core.cache import cache
 from django.test import TestCase
 
 from allianceauth.templatetags.admin_status import (
-    _current_notifications,
+    _current_notifications, _current_version_summary, _fetch_list_from_gitlab,
-    _current_version_summary,
+    _fetch_notification_issues_from_gitlab, _latests_versions, status_overview,
-    _fetch_list_from_gitlab,
-    _fetch_notification_issues_from_gitlab,
-    _latests_versions,
-    status_overview,
 )
 
 MODULE_PATH = 'allianceauth.templatetags'
@@ -131,7 +127,7 @@ class TestNotifications(TestCase):
         # when
         result = _current_notifications()
         # then
-        self.assertEqual(result['notifications'], [])
+        self.assertEqual(result['notifications'], list())
 
     @patch(MODULE_PATH + '.admin_status.cache')
     def test_current_notifications_is_none(self, mock_cache):
@@ -140,7 +136,7 @@ class TestNotifications(TestCase):
         # when
         result = _current_notifications()
         # then
-        self.assertEqual(result['notifications'], [])
+        self.assertEqual(result['notifications'], list())
 
 
 class TestCeleryQueueLength(TestCase):

allianceauth/authentication/tests/test_views.py

@@ -1,13 +1,12 @@
 import json
-from unittest.mock import patch
-
 import requests_mock
+from unittest.mock import patch
 
 from django.test import RequestFactory, TestCase
 
-from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES
+from allianceauth.authentication.views import task_counts, esi_check
-from allianceauth.authentication.views import esi_check, task_counts
 from allianceauth.tests.auth_utils import AuthUtils
+from allianceauth.authentication.constants import ESI_ERROR_MESSAGE_OVERRIDES
 
 MODULE_PATH = "allianceauth.authentication.views"
 

allianceauth/authentication/views.py

@@ -1,6 +1,11 @@
 import logging
 
 import requests
+from django_registration.backends.activation.views import (
+    REGISTRATION_SALT, ActivationView as BaseActivationView,
+    RegistrationView as BaseRegistrationView,
+)
+from django_registration.signals import user_registered
 
 from django.conf import settings
 from django.contrib import messages
@@ -13,12 +18,6 @@ from django.shortcuts import redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
-from django_registration.backends.activation.views import (
-    REGISTRATION_SALT,
-    ActivationView as BaseActivationView,
-    RegistrationView as BaseRegistrationView,
-)
-from django_registration.signals import user_registered
 
 from esi.decorators import token_required
 from esi.models import Token
@@ -33,7 +32,7 @@ from .models import CharacterOwnership
 
 if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
     _has_auto_groups = True
-    from allianceauth.eveonline.autogroups.models import *  # noqa: F403
+    from allianceauth.eveonline.autogroups.models import *  # noqa: F401, F403
 else:
     _has_auto_groups = False
 
@@ -88,7 +87,7 @@ def dashboard_esi_check(request):
 
 @login_required
 def dashboard(request):
-    _dash_items = []
+    _dash_items = list()
     hooks = get_hooks('dashboard_hook')
     items = [fn() for fn in hooks]
     items.sort(key=lambda i: i.order)
@@ -165,7 +164,9 @@ def main_character_change(request, token):
         request.user.profile.save(update_fields=['main_character'])
         messages.success(request, _('Changed main character to %s') % co.character)
         logger.info(
-            f'Changed user {request.user} main character to {co.character}'
+            'Changed user {user} main character to {char}'.format(
+                user=request.user, char=co.character
+            )
         )
     return redirect("authentication:dashboard")
 
@@ -175,9 +176,10 @@ def add_character(request, token):
     if CharacterOwnership.objects.filter(character__character_id=token.character_id).filter(
             owner_hash=token.character_owner_hash).filter(user=request.user).exists():
         messages.success(request, _(
-            'Added {name} to your account.'.format(name=token.character_name)))
+            'Added %(name)s to your account.' % ({'name': token.character_name})))
     else:
-        messages.error(request, _('Failed to add {name} to your account: they already have an account.'.format(name=token.character_name)))
+        messages.error(request, _('Failed to add %(name)s to your account: they already have an account.' % (
+            {'name': token.character_name})))
     return redirect('authentication:dashboard')
 
 
@@ -292,7 +294,7 @@ class RegistrationView(BaseRegistrationView):
             return redirect(settings.LOGIN_URL)
         if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
             # Keep the request so the user can be automagically logged in.
-            self.request = request
+            setattr(self, 'request', request)
         return super().dispatch(request, *args, **kwargs)
 
     def register(self, form):

allianceauth/bin/allianceauth.py

@@ -2,7 +2,6 @@
 import os
 import shutil
 from optparse import OptionParser
-
 from django.core.management import call_command
 from django.core.management.commands.startproject import Command as BaseStartProject
 
@@ -44,7 +43,7 @@ def create_project(parser, options, args):
     # Call the command with extra context
     call_command(StartProject(), *args, **command_options)
 
-    print(f"Success! {args[0]} has been created.")
+    print(f"Success! {args[0]} has been created.")  # noqa
 
 
 def update_settings(parser, options, args):
@@ -63,7 +62,7 @@ def update_settings(parser, options, args):
         # next check if given path is to the project, so the app is within it
         settings_path = os.path.join(project_path, project_name, 'settings/base.py')
         if not os.path.exists(settings_path):
-            parser.error(f"Unable to locate the Alliance Auth project at {project_path}")
+            parser.error("Unable to locate the Alliance Auth project at %s" % project_path)
 
     # first find the path to the Alliance Auth template settings
     import allianceauth

allianceauth/checks.py

@@ -1,16 +1,12 @@
-import datetime
-from sqlite3.dbapi2 import sqlite_version_info
-
-from celery import current_app
-from packaging.version import InvalidVersion, Version as Pep440Version
-
 from django import db
-from django.conf import settings
+from django.core.checks import CheckMessage, Error, register, Warning
-from django.core.checks import CheckMessage, Error, Warning, register
-from django.utils import timezone
-
 from allianceauth.utils.cache import get_redis_client
-
+from django.utils import timezone
+from packaging.version import InvalidVersion, Version as Pep440Version
+from celery import current_app
+from django.conf import settings
+from sqlite3.dbapi2 import sqlite_version_info
+import datetime
 """
 A = System Packages
 B = Configuration
@@ -105,7 +101,8 @@ def system_package_mariadb(app_configs, **kwargs) -> list[CheckMessage]:
                     errors.append(Error(f"MariaDB {mariadb_version.public}  EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A011"))
             elif mariadb_version.major == 11 and mariadb_version.minor == 1:
                 errors.append(Warning(f"MariaDB {mariadb_version.public} Non LTS", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A019"))
-                errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A012"))
+                if timezone.now() > timezone.datetime(year=2024, month=8, day=21, tzinfo=datetime.timezone.utc):
+                    errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config", id="allianceauth.checks.A012"))
             elif mariadb_version.major == 11 and mariadb_version.minor in [0, 3]:  # Demote versions down here once EOL
                 errors.append(Error(f"MariaDB {mariadb_version.public} EOL", hint="https://mariadb.org/download/?t=repo-config.", id="allianceauth.checks.A013"))
 
@@ -171,7 +168,7 @@ def celery_settings(app_configs, **kwargs) -> list[CheckMessage]:
         errors.append(Error("Celery Priorities are not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
 
     try:
-        if current_app.conf.broker_connection_retry_on_startup is not True:
+        if current_app.conf.broker_connection_retry_on_startup != True:
             errors.append(Error("Celery broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
     except KeyError:
         errors.append(Error("Celery broker_connection_retry_on_startup not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))

allianceauth/context_processors.py

@@ -1,5 +1,4 @@
 from django.conf import settings
-
 from .views import NightModeRedirectView
 
 

allianceauth/corputils/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import CorpMember, CorpStats
+from .models import CorpStats, CorpMember
 
 admin.site.register(CorpStats)
 admin.site.register(CorpMember)

allianceauth/corputils/auth_hooks.py

@@ -1,9 +1,8 @@
-from django.utils.translation import gettext_lazy as _
-
-from allianceauth import hooks
-from allianceauth.corputils import urls
 from allianceauth.menu.hooks import MenuItemHook
 from allianceauth.services.hooks import UrlHook
+from django.utils.translation import gettext_lazy as _
+from allianceauth import hooks
+from allianceauth.corputils import urls
 
 
 class CorpStats(MenuItemHook):

allianceauth/corputils/managers.py

@@ -1,6 +1,5 @@
-import logging
-
 from django.db import models
+import logging
 
 logger = logging.getLogger(__name__)
 
@@ -9,7 +8,7 @@ class CorpStatsQuerySet(models.QuerySet):
     def visible_to(self, user):
         # superusers get all visible
         if user.is_superuser:
-            logger.debug(f'Returning all corpstats for superuser {user}.')
+            logger.debug('Returning all corpstats for superuser %s.' % user)
             return self
 
         try:
@@ -37,7 +36,7 @@ class CorpStatsQuerySet(models.QuerySet):
                 query |= q
             return self.filter(query)
         except AssertionError:
-            logger.debug(f'User {user} has no main character. No corpstats visible.')
+            logger.debug('User %s has no main character. No corpstats visible.' % user)
             return self.none()
 
 

allianceauth/corputils/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 1.10.1 on 2016-12-14 21:36
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allianceauth/corputils/migrations/0002_migrate_permissions.py

@@ -66,7 +66,7 @@ def forward(apps, schema_editor):
         g.permissions.add(perm_dict['corpstats']['alliance_apis'].pk)
         g.permissions.add(perm_dict['corpstats']['view_alliance_corpstats'].pk)
 
-    for _name, perm in perm_dict['user'].items():
+    for name, perm in perm_dict['user'].items():
         perm.delete()
 
 

allianceauth/corputils/migrations/0004_member_models.py

@@ -1,9 +1,8 @@
 # Generated by Django 1.10.5 on 2017-03-26 20:13
 
-import json
-
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
+import json
 
 
 def convert_json_to_members(apps, schema_editor):

allianceauth/corputils/models.py

@@ -1,18 +1,16 @@
 import logging
 import os
 
+from allianceauth.authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
-
 from django.db import models
-
 from esi.errors import TokenError
 from esi.models import Token
-
+from allianceauth.eveonline.models import EveCorporationInfo, EveCharacter, EveAllianceInfo
-from allianceauth.authentication.models import CharacterOwnership, UserProfile
-from allianceauth.corputils.managers import CorpStatsManager
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
 from allianceauth.notifications import notify
 
+from allianceauth.corputils.managers import CorpStatsManager
+
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """
 Swagger spec operations:
@@ -33,7 +31,6 @@ class CorpStats(models.Model):
     corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE)
     last_update = models.DateTimeField(auto_now=True)
 
-    objects = CorpStatsManager()
     class Meta:
         permissions = (
             ('view_corp_corpstats', 'Can view corp stats of their corporation.'),
@@ -43,7 +40,7 @@ class CorpStats(models.Model):
         verbose_name = "corp stats"
         verbose_name_plural = "corp stats"
 
-
+    objects = CorpStatsManager()
 
     def __str__(self):
         return f"{self.__class__.__name__} for {self.corp}"
@@ -79,21 +76,21 @@ class CorpStats(models.Model):
             logger.warning(f"{self} failed to update: {e}")
             if self.token.user:
                 notify(
-                    self.token.user, f"{self} failed to update with your ESI token.",
+                    self.token.user, "%s failed to update with your ESI token." % self,
                     message="Your token has expired or is no longer valid. Please add a new one to create a new CorpStats.",
                     level="error")
             self.delete()
         except HTTPForbidden as e:
             logger.warning(f"{self} failed to update: {e}")
             if self.token.user:
-                notify(self.token.user, f"{self} failed to update with your ESI token.", message=f"{e.status_code}: {e.message}", level="error")
+                notify(self.token.user, "%s failed to update with your ESI token." % self, message=f"{e.status_code}: {e.message}", level="error")
             self.delete()
         except AssertionError:
-            logger.warning(f"{self} token character no longer in corp.")
+            logger.warning("%s token character no longer in corp." % self)
             if self.token.user:
                 notify(
-                    self.token.user, f"{self} cannot update with your ESI token.",
+                    self.token.user, "%s cannot update with your ESI token." % self,
-                    message=f"{self} cannot update with your ESI token as you have left corp.", level="error")
+                    message="%s cannot update with your ESI token as you have left corp." % self, level="error")
             self.delete()
 
     @property

allianceauth/corputils/tasks.py

@@ -1,5 +1,4 @@
 from celery import shared_task
-
 from allianceauth.corputils.models import CorpStats
 
 

allianceauth/corputils/tests.py

@@ -1,18 +1,14 @@
 from unittest import mock
 
-from bravado.exception import HTTPForbidden
-
-from django.contrib.auth.models import Permission
 from django.test import TestCase
-
-from esi.errors import TokenError
-from esi.models import Token
-
-from allianceauth.authentication.models import CharacterOwnership
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
 from allianceauth.tests.auth_utils import AuthUtils
-
+from .models import CorpStats, CorpMember
-from .models import CorpMember, CorpStats
+from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo, EveCharacter
+from esi.models import Token
+from esi.errors import TokenError
+from bravado.exception import HTTPForbidden
+from django.contrib.auth.models import Permission
+from allianceauth.authentication.models import CharacterOwnership
 
 
 class CorpStatsManagerTestCase(TestCase):

allianceauth/corputils/urls.py

@@ -1,5 +1,4 @@
 from django.urls import path
-
 from . import views
 
 app_name = 'corputils'

allianceauth/corputils/views.py

@@ -1,19 +1,16 @@
 import os
 
 from bravado.exception import HTTPError
-
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required, user_passes_test
-from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
+from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
 from django.db import IntegrityError
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.translation import gettext_lazy as _
-
 from esi.decorators import token_required
-
 from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo
 
-from .models import CorpMember, CorpStats
+from .models import CorpStats, CorpMember
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 """

allianceauth/custom_css/__init__.py

@@ -1,3 +0,0 @@
-"""
-Initializes the custom_css module.
-"""

allianceauth/custom_css/admin.py

@@ -1,26 +0,0 @@
-"""
-Admin classes for custom_css app
-"""
-
-# Django
-# Django Solos
-from solo.admin import SingletonModelAdmin
-
-from django.contrib import admin
-
-from allianceauth.custom_css.forms import CustomCSSAdminForm
-
-# Alliance Auth Custom CSS
-from allianceauth.custom_css.models import CustomCSS
-
-
-@admin.register(CustomCSS)
-class CustomCSSAdmin(SingletonModelAdmin):
-    """
-    Custom CSS Admin
-    """
-
-    form = CustomCSSAdminForm
-
-    # Leave this here for when we decide to add syntax highlighting to the CSS editor
-    # change_form_template = 'custom_css/admin/change_form.html'

allianceauth/custom_css/apps.py

@@ -1,13 +0,0 @@
-"""
-Django app configuration for custom_css
-"""
-
-# Django
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-
-class CustomCSSConfig(AppConfig):
-    name = "allianceauth.custom_css"
-    label = "custom_css"
-    verbose_name = _("Custom CSS")

allianceauth/custom_css/forms.py

@@ -1,29 +0,0 @@
-"""
-Forms for custom_css app
-"""
-
-# Alliance Auth Custom CSS
-# Django
-from django import forms
-
-from allianceauth.custom_css.models import CustomCSS
-from allianceauth.custom_css.widgets import CssEditorWidget
-
-
-class CustomCSSAdminForm(forms.ModelForm):
-    """
-    Form for editing custom CSS
-    """
-
-    class Meta:
-        model = CustomCSS
-        fields = ("css",)
-        widgets = {
-            "css": CssEditorWidget(
-                attrs={
-                    "style": "width: 90%; height: 100%;",
-                    "data-editor": "code-highlight",
-                    "data-language": "css",
-                }
-            )
-        }

allianceauth/custom_css/migrations/0001_initial.py

@@ -1,42 +0,0 @@
-# Generated by Django 4.2.15 on 2024-08-14 11:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = []
-
-    operations = [
-        migrations.CreateModel(
-            name="CustomCSS",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "css",
-                    models.TextField(
-                        blank=True,
-                        help_text="This CSS will be added to the site after the default CSS.",
-                        null=True,
-                        verbose_name="Your custom CSS",
-                    ),
-                ),
-                ("timestamp", models.DateTimeField(auto_now=True)),
-            ],
-            options={
-                "verbose_name": "Custom CSS",
-                "verbose_name_plural": "Custom CSS",
-                "default_permissions": (),
-            },
-        ),
-    ]

allianceauth/custom_css/models.py

@@ -1,142 +0,0 @@
-"""
-Models for the custom_css app
-"""
-
-import os
-import re
-
-# Django Solo
-from solo.models import SingletonModel
-
-# Django
-from django.conf import settings
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-
-class CustomCSS(SingletonModel):
-    """
-    Model for storing custom CSS for the site
-    """
-
-    css = models.TextField(
-        blank=True,
-        verbose_name=_("Your custom CSS"),
-        help_text=_("This CSS will be added to the site after the default CSS."),
-    )
-    timestamp = models.DateTimeField(auto_now=True)
-
-    class Meta:
-        """
-        Meta for CustomCSS
-        """
-
-        default_permissions = ()
-        verbose_name = _("Custom CSS")
-        verbose_name_plural = _("Custom CSS")
-
-    def __str__(self) -> str:
-        """
-        String representation of CustomCSS
-
-        :return:
-        :rtype:
-        """
-
-        return str(_("Custom CSS"))
-
-    def save(self, *args, **kwargs):
-        """
-        Save method for CustomCSS
-
-        :param args:
-        :type args:
-        :param kwargs:
-        :type kwargs:
-        :return:
-        :rtype:
-        """
-
-        self.pk = 1
-
-        if self.css and len(self.css.replace(" ", "")) > 0:
-            # Write the custom CSS to a file
-            custom_css_file = open(
-                f"{settings.STATIC_ROOT}allianceauth/custom-styles.css", "w+"
-            )
-            custom_css_file.write(self.compress_css())
-            custom_css_file.close()
-        else:
-            # Remove the custom CSS file
-            try:
-                os.remove(f"{settings.STATIC_ROOT}allianceauth/custom-styles.css")
-            except FileNotFoundError:
-                pass
-
-        super().save(*args, **kwargs)
-
-    def compress_css(self) -> str:
-        """
-        Compress CSS
-
-        :return:
-        :rtype:
-        """
-
-        css = self.css
-        new_css = ""
-
-        # Remove comments
-        css = re.sub(pattern=r"\s*/\*\s*\*/", repl="$$HACK1$$", string=css)
-        css = re.sub(pattern=r"/\*[\s\S]*?\*/", repl="", string=css)
-        css = css.replace("$$HACK1$$", "/**/")
-
-        # url() doesn't need quotes
-        css = re.sub(pattern=r'url\((["\'])([^)]*)\1\)', repl=r"url(\2)", string=css)
-
-        # Spaces may be safely collapsed as generated content will collapse them anyway.
-        css = re.sub(pattern=r"\s+", repl=" ", string=css)
-
-        # Shorten collapsable colors: #aabbcc to #abc
-        css = re.sub(
-            pattern=r"#([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3(\s|;)",
-            repl=r"#\1\2\3\4",
-            string=css,
-        )
-
-        # Fragment values can loose zeros
-        css = re.sub(
-            pattern=r":\s*0(\.\d+([cm]m|e[mx]|in|p[ctx]))\s*;", repl=r":\1;", string=css
-        )
-
-        for rule in re.findall(pattern=r"([^{]+){([^}]*)}", string=css):
-            # We don't need spaces around operators
-            selectors = [
-                re.sub(
-                    pattern=r"(?<=[\[\(>+=])\s+|\s+(?=[=~^$*|>+\]\)])",
-                    repl=r"",
-                    string=selector.strip(),
-                )
-                for selector in rule[0].split(",")
-            ]
-
-            # Order is important, but we still want to discard repetitions
-            properties = {}
-            porder = []
-
-            for prop in re.findall(pattern="(.*?):(.*?)(;|$)", string=rule[1]):
-                key = prop[0].strip().lower()
-
-                if key not in porder:
-                    porder.append(key)
-
-                properties[key] = prop[1].strip()
-
-            # output rule if it contains any declarations
-            if properties:
-                new_css += "{}{{{}}}".format(
-                    ",".join(selectors),
-                    "".join([f"{key}:{properties[key]};" for key in porder])[:-1],
-                )
-
-        return new_css

allianceauth/custom_css/templates/custom_css/admin/change_form.html

@@ -1,48 +0,0 @@
-{% extends "admin/change_form.html" %}
-
-{% block field_sets %}
-    {% for fieldset in adminform %}
-        <fieldset class="module aligned {{ fieldset.classes }}">
-            {% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
-
-            {% if fieldset.description %}
-                <div class="description">{{ fieldset.description|safe }}</div>
-            {% endif %}
-
-            {% for line in fieldset %}
-                <div class="form-row{% if line.fields|length == 1 and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">
-                    {% if line.fields|length == 1 %}{{ line.errors }}{% else %}<div class="flex-container form-multiline">{% endif %}
-
-                    {% for field in line %}
-                        <div>
-                            {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
-
-                            <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
-                                {% if field.is_checkbox %}
-                                    {{ field.field }}{{ field.label_tag }}
-                                {% else %}
-                                    {{ field.label_tag }}
-                                    {% if field.is_readonly %}
-                                        <div class="readonly">{{ field.contents }}</div>
-                                    {% else %}
-                                        {{ field.field }}
-                                    {% endif %}
-                                {% endif %}
-                            </div>
-
-                            {% if field.field.help_text %}
-                                <div class="help"{% if field.field.id_for_label %} id="{{ field.field.id_for_label }}_helptext"{% endif %}>
-                                    <div>{{ field.field.help_text|safe }}</div>
-                                </div>
-                            {% endif %}
-                        </div>
-                    {% endfor %}
-
-                    {% if not line.fields|length == 1 %}</div>{% endif %}
-                </div>
-            {% endfor %}
-        </fieldset>
-    {% endfor %}
-{% endblock %}
-
-{% block after_field_sets %}{% endblock %}

allianceauth/custom_css/templates/custom_css/bundles/custom-css.html

@@ -1,3 +0,0 @@
-{% load custom_css %}
-
-{% custom_css_static 'allianceauth/custom-styles.css' %}

allianceauth/custom_css/templatetags/__init__.py

@@ -1,3 +0,0 @@
-"""
-Init file for custom_css templatetags
-"""

allianceauth/custom_css/templatetags/custom_css.py

@@ -1,48 +0,0 @@
-"""
-Custom template tags for custom_css app
-"""
-
-# Alliance Auth Custom CSS
-from pathlib import Path
-
-# Django
-from django.conf import settings
-from django.template.defaulttags import register
-from django.templatetags.static import static
-from django.utils.safestring import mark_safe
-
-from allianceauth.custom_css.models import CustomCSS
-
-
-@register.simple_tag
-def custom_css_static(path: str) -> str:
-    """
-    Versioned static URL
-    This is to make sure to break the browser cache on CSS updates.
-
-    Example: /static/allianceauth/custom-styles.css?v=1234567890
-
-    :param path:
-    :type path:
-    :return:
-    :rtype:
-    """
-
-    try:
-        Path(f"{settings.STATIC_ROOT}{path}").resolve(strict=True)
-    except FileNotFoundError:
-        return ""
-    else:
-        try:
-            custom_css = CustomCSS.objects.get(pk=1)
-        except CustomCSS.DoesNotExist:
-            return ""
-        else:
-            custom_css_changed = custom_css.timestamp.timestamp()
-            custom_css_version = (
-                str(custom_css_changed).replace(" ", "").replace(":", "").replace("-", "")
-            )  # remove spaces, colons, and dashes
-            static_url = static(path)
-            versioned_url = static_url + "?v=" + custom_css_version
-
-            return mark_safe(f'<link rel="stylesheet" href="{versioned_url}">')

allianceauth/custom_css/widgets.py

@@ -1,37 +0,0 @@
-"""
-Form widgets for custom_css app
-"""
-
-# Django
-from django import forms
-
-# Alliance Auth
-
-
-class CssEditorWidget(forms.Textarea):
-    """
-    Widget for editing CSS
-    """
-
-    def __init__(self, attrs=None):
-        default_attrs = {"class": "custom-css-editor"}
-
-        if attrs:
-            default_attrs.update(attrs)
-
-        super().__init__(default_attrs)
-
-    # For when we want to add some sort of syntax highlight to it, which is not that
-    # easy to do on a textarea field though.
-    # `highlight.js` is just used as an example here, and doesn't work on a textarea field.
-    # class Media:
-    #     css = {
-    #         "all": (
-    #             "/static/custom_css/libs/highlight.js/11.10.0/styles/github.min.css",
-    #         )
-    #     }
-    #     js = (
-    #         "/static/custom_css/libs/highlight.js/11.10.0/highlight.min.js",
-    #         "/static/custom_css/libs/highlight.js/11.10.0/languages/css.min.js",
-    #         "/static/custom_css/javascript/custom-css.min.js",
-    #     )

allianceauth/eveonline/admin.py

@@ -1,10 +1,13 @@
 from django import forms
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
-
-from .models import EveAllianceInfo, EveCharacter, EveCorporationInfo, EveFactionInfo
 from .providers import ObjectNotFound
 
+from .models import EveAllianceInfo
+from .models import EveCharacter
+from .models import EveCorporationInfo
+from .models import EveFactionInfo
+
 
 class EveEntityExistsError(forms.ValidationError):
     def __init__(self, entity_type_name, id):

allianceauth/eveonline/autogroups/admin.py

@@ -1,9 +1,9 @@
-import logging
-
 from django.contrib import admin
 from django.db import models
+from .models import AutogroupsConfig, ManagedCorpGroup, ManagedAllianceGroup
+
+import logging
 
-from .models import AutogroupsConfig, ManagedAllianceGroup, ManagedCorpGroup
 
 logger = logging.getLogger(__name__)
 

allianceauth/eveonline/autogroups/apps.py

@@ -6,4 +6,4 @@ class EveAutogroupsConfig(AppConfig):
     label = 'eve_autogroups'
 
     def ready(self):
-        pass
+        import allianceauth.eveonline.autogroups.signals

allianceauth/eveonline/autogroups/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 1.11.6 on 2017-12-23 04:30
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allianceauth/eveonline/autogroups/models.py

@@ -1,11 +1,10 @@
 import logging
-
+from django.db import models, transaction
 from django.contrib.auth.models import Group, User
 from django.core.exceptions import ObjectDoesNotExist
-from django.db import models, transaction
 
 from allianceauth.authentication.models import State
-from allianceauth.eveonline.models import EveAllianceInfo, EveCorporationInfo
+from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo
 
 logger = logging.getLogger(__name__)
 
@@ -81,15 +80,15 @@ class AutogroupsConfig(models.Model):
 
     objects = AutogroupsConfigManager()
 
-    def __str__(self):
-        return 'States: ' + (' '.join(list(self.states.all().values_list('name', flat=True))) if self.pk else str(None))
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def __repr__(self):
         return self.__class__.__name__
 
+    def __str__(self):
+        return 'States: ' + (' '.join(list(self.states.all().values_list('name', flat=True))) if self.pk else str(None))
+
     def update_all_states_group_membership(self):
         list(map(self.update_group_membership_for_state, self.states.all()))
 
@@ -236,7 +235,7 @@ class ManagedGroup(models.Model):
         abstract = True
 
     def __str__(self):
-        return f"Managed Group: {self.group.name}"
+        return "Managed Group: %s" % self.group.name
 
 class ManagedCorpGroup(ManagedGroup):
     corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE)

allianceauth/eveonline/autogroups/signals.py

@@ -1,9 +1,7 @@
 import logging
-
-from django.db.models.signals import m2m_changed, post_save, pre_delete, pre_save
 from django.dispatch import receiver
-
+from django.db.models.signals import pre_save, post_save, pre_delete, m2m_changed
-from allianceauth.authentication.models import State, UserProfile
+from allianceauth.authentication.models import UserProfile, State
 from allianceauth.eveonline.models import EveCharacter
 
 from .models import AutogroupsConfig

allianceauth/eveonline/autogroups/tests/__init__.py

@@ -1,10 +1,7 @@
 from unittest import mock
-
+from django.db.models.signals import pre_save, post_save, pre_delete, m2m_changed
-from django.db.models.signals import m2m_changed, post_save, pre_delete, pre_save
-
 from allianceauth.authentication.models import UserProfile
 from allianceauth.authentication.signals import reassess_on_profile_save
-
 from .. import signals
 from ..models import AutogroupsConfig
 

allianceauth/eveonline/autogroups/tests/test_managers.py

@@ -1,5 +1,4 @@
 from django.test import TestCase
-
 from allianceauth.tests.auth_utils import AuthUtils
 
 from ..models import AutogroupsConfig

allianceauth/eveonline/autogroups/tests/test_models.py

@@ -1,11 +1,15 @@
-from django.contrib.auth.models import Group
 from django.test import TestCase
+from django.contrib.auth.models import Group
+from django.db import transaction
 
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
 from allianceauth.tests.auth_utils import AuthUtils
 
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo
+
 from ..models import AutogroupsConfig, get_users_for_state
-from . import connect_signals, disconnect_signals, patch
+
+
+from . import patch, connect_signals, disconnect_signals
 
 
 class AutogroupsConfigTestCase(TestCase):

allianceauth/eveonline/autogroups/tests/test_signals.py

@@ -1,11 +1,13 @@
-from django.contrib.auth.models import User
 from django.test import TestCase
+from django.contrib.auth.models import User
 
-from allianceauth.eveonline.models import EveAllianceInfo, EveCharacter, EveCorporationInfo
 from allianceauth.tests.auth_utils import AuthUtils
 
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo
+
 from ..models import AutogroupsConfig
-from . import connect_signals, disconnect_signals, patch
+
+from . import patch, disconnect_signals, connect_signals
 
 
 class SignalsTestCase(TestCase):

allianceauth/eveonline/evelinks/dotlan.py

@@ -1,8 +1,14 @@
 # this module generates profile URLs for dotlan
 
-from urllib.parse import quote, urljoin
+from urllib.parse import urljoin, quote
+
+from . import (
+    _ESI_CATEGORY_ALLIANCE,
+    _ESI_CATEGORY_CORPORATION,
+    _ESI_CATEGORY_REGION,
+    _ESI_CATEGORY_SOLARSYSTEM
+)
 
-from . import _ESI_CATEGORY_ALLIANCE, _ESI_CATEGORY_CORPORATION, _ESI_CATEGORY_REGION, _ESI_CATEGORY_SOLARSYSTEM
 
 _BASE_URL = 'http://evemaps.dotlan.net'
 

allianceauth/eveonline/evelinks/eveimageserver.py

@@ -1,4 +1,10 @@
-from . import _ESI_CATEGORY_ALLIANCE, _ESI_CATEGORY_CHARACTER, _ESI_CATEGORY_CORPORATION, _ESI_CATEGORY_INVENTORYTYPE
+from . import (
+    _ESI_CATEGORY_ALLIANCE,
+    _ESI_CATEGORY_CHARACTER,
+    _ESI_CATEGORY_CORPORATION,
+    _ESI_CATEGORY_INVENTORYTYPE
+)
+
 
 _EVE_IMAGE_SERVER_URL = 'https://images.evetech.net'
 _DEFAULT_IMAGE_SIZE = 32
@@ -64,7 +70,10 @@ def _eve_entity_image_url(
 
     if variant:
         if variant not in categories[category]['variants']:
-            raise ValueError(f'Invalid variant {variant} for category {category}')
+            raise ValueError('Invalid variant {} for category {}'.format(
+                variant,
+                category
+            ))
     else:
         variant = categories[category]['variants'][0]
 
@@ -72,7 +81,13 @@ def _eve_entity_image_url(
         raise ValueError(f'Invalid tenant {tenant}')
 
     # compose result URL
-    result = f'{_EVE_IMAGE_SERVER_URL}/{endpoint}/{entity_id}/{variant}?size={size}'
+    result = '{}/{}/{}/{}?size={}'.format(
+        _EVE_IMAGE_SERVER_URL,
+        endpoint,
+        entity_id,
+        variant,
+        size
+    )
     if tenant:
         result += f'&tenant={tenant}'
 

allianceauth/eveonline/evelinks/evewho.py

@@ -4,10 +4,11 @@ from urllib.parse import urljoin
 
 from . import (
     _ESI_CATEGORY_ALLIANCE,
-    _ESI_CATEGORY_CHARACTER,
     _ESI_CATEGORY_CORPORATION,
+    _ESI_CATEGORY_CHARACTER,
 )
 
+
 _BASE_URL = 'https://evewho.com'
 
 

allianceauth/eveonline/evelinks/tests/test_evelinks.py

@@ -1,6 +1,8 @@
 from django.test import TestCase
 
-from .. import dotlan, eveimageserver, evewho, zkillboard
+from ...models import EveCharacter, EveCorporationInfo, EveAllianceInfo
+from .. import dotlan, zkillboard, evewho, eveimageserver
+from ...templatetags import evelinks
 
 
 class TestEveWho(TestCase):

allianceauth/eveonline/evelinks/tests/test_templatetags.py

@@ -1,8 +1,8 @@
 from django.test import TestCase
 
-from ...models import EveAllianceInfo, EveCharacter, EveCorporationInfo
+from ...models import EveCharacter, EveCorporationInfo, EveAllianceInfo
+from .. import eveimageserver, evewho, dotlan, zkillboard
 from ...templatetags import evelinks
-from .. import dotlan, eveimageserver, evewho, zkillboard
 
 
 class TestTemplateTags(TestCase):