Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-14 11:06:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

update code to reflect the new minimum python version 3.7

Browse Source 
- update string format method
- remove redundant default arguments from function  calls
- remove unused imports
- remove unicode identifier from strings, it's default in py3 (see: https://stackoverflow.com/a/4182635/12201331)
This commit is contained in:
Peter Pfeufer
2021-10-18 11:59:05 +02:00
parent 2fe1de1c97
commit a6b340c179
199 changed files with 499 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
allianceauth/eveonline/autogroups/admin.py
View File

@@ -10,7 +10,7 @@ logger = logging.getLogger(__name__)
def sync_user_groups(modeladmin, request, queryset):
for agc in queryset:
logger.debug("update_all_states_group_membership for {}".format(agc))
logger.debug(f"update_all_states_group_membership for {agc}")
agc.update_all_states_group_membership()
@@ -29,7 +29,7 @@ class AutogroupsConfigAdmin(admin.ModelAdmin):
return []
def get_actions(self, request):
actions = super(AutogroupsConfigAdmin, self).get_actions(request)
actions = super().get_actions(request)
actions['sync_user_groups'] = (sync_user_groups,
'sync_user_groups',
'Sync all users groups for this Autogroup Config')

1
allianceauth/eveonline/autogroups/migrations/0001_initial.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.11.6 on 2017-12-23 04:30
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion

22
allianceauth/eveonline/autogroups/models.py
View File

@@ -26,7 +26,7 @@ class AutogroupsConfigManager(models.Manager):
for config in self.filter(states=state):
logger.debug("in state loop")
for user in users:
logger.debug("in user loop for {}".format(user))
logger.debug(f"in user loop for {user}")
config.update_group_membership_for_user(user)
def update_groups_for_user(self, user: User, state: State = None):
@@ -81,7 +81,7 @@ class AutogroupsConfig(models.Model):
objects = AutogroupsConfigManager()
def __init__(self, *args, **kwargs):
super(AutogroupsConfig, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
def __repr__(self):
return self.__class__.__name__
@@ -111,24 +111,24 @@ class AutogroupsConfig(models.Model):
group = None
try:
if not self.alliance_groups or not self.user_entitled_to_groups(user):
logger.debug('User {} does not have required state for alliance group membership'.format(user))
logger.debug(f'User {user} does not have required state for alliance group membership')
return
else:
alliance = user.profile.main_character.alliance
if alliance is None:
logger.debug('User {} alliance is None, cannot update group membership'.format(user))
logger.debug(f'User {user} alliance is None, cannot update group membership')
return
group = self.get_alliance_group(alliance)
except EveAllianceInfo.DoesNotExist:
logger.debug('User {} main characters alliance does not exist in the database. Creating.'.format(user))
logger.debug(f'User {user} main characters alliance does not exist in the database. Creating.')
alliance = EveAllianceInfo.objects.create_alliance(user.profile.main_character.alliance_id)
group = self.get_alliance_group(alliance)
except AttributeError:
logger.warning('User {} does not have a main character. Group membership not updated'.format(user))
logger.warning(f'User {user} does not have a main character. Group membership not updated')
finally:
self.remove_user_from_alliance_groups(user, except_group=group)
if group is not None:
logger.debug('Adding user {} to alliance group {}'.format(user, group))
logger.debug(f'Adding user {user} to alliance group {group}')
user.groups.add(group)
@transaction.atomic
@@ -136,20 +136,20 @@ class AutogroupsConfig(models.Model):
group = None
try:
if not self.corp_groups or not self.user_entitled_to_groups(user):
logger.debug('User {} does not have required state for corp group membership'.format(user))
logger.debug(f'User {user} does not have required state for corp group membership')
else:
corp = user.profile.main_character.corporation
group = self.get_corp_group(corp)
except EveCorporationInfo.DoesNotExist:
logger.debug('User {} main characters corporation does not exist in the database. Creating.'.format(user))
logger.debug(f'User {user} main characters corporation does not exist in the database. Creating.')
corp = EveCorporationInfo.objects.create_corporation(user.profile.main_character.corporation_id)
group = self.get_corp_group(corp)
except AttributeError:
logger.warning('User {} does not have a main character. Group membership not updated'.format(user))
logger.warning(f'User {user} does not have a main character. Group membership not updated')
finally:
self.remove_user_from_corp_groups(user, except_group=group)
if group is not None:
logger.debug('Adding user {} to corp group {}'.format(user, group))
logger.debug(f'Adding user {user} to corp group {group}')
user.groups.add(group)
@transaction.atomic

2
allianceauth/eveonline/autogroups/signals.py
View File

@@ -15,7 +15,7 @@ def pre_save_config(sender, instance, *args, **kwargs):
Checks if enable was toggled on group config and
deletes groups if necessary.
"""
logger.debug("Received pre_save from {}".format(instance))
logger.debug(f"Received pre_save from {instance}")
if not instance.pk:
# new model being created
return

2
allianceauth/eveonline/autogroups/tests/__init__.py
View File

@@ -9,7 +9,7 @@ MODULE_PATH = 'allianceauth.eveonline.autogroups'
def patch(target, *args, **kwargs):
return mock.patch('{}{}'.format(MODULE_PATH, target), *args, **kwargs)
return mock.patch(f'{MODULE_PATH}{target}', *args, **kwargs)
def connect_signals():