Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-11 01:26:22 +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

2
allianceauth/corputils/managers.py
View File

@@ -29,7 +29,7 @@ class CorpStatsQuerySet(models.QuerySet):
if user.has_perm('corputils.view_state_corpstats'):
queries.append(models.Q(corp__in=user.profile.state.member_corporations.all()))
queries.append(models.Q(corp__alliance__in=user.profile.state.member_alliances.all()))
logger.debug('%s queries for user %s visible corpstats.' % (len(queries), user))
logger.debug(f'{len(queries)} queries for user {user} visible corpstats.')
# filter based on queries
query = queries.pop()
for q in queries:

1
allianceauth/corputils/migrations/0001_initial.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.1 on 2016-12-14 21:36
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion

1
allianceauth/corputils/migrations/0002_migrate_permissions.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.1 on 2016-12-14 21:48
from __future__ import unicode_literals
from django.db import migrations

1
allianceauth/corputils/migrations/0003_granular_permissions.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.5 on 2017-03-22 23:35
from __future__ import unicode_literals
from django.db import migrations

3
allianceauth/corputils/migrations/0004_member_models.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.5 on 2017-03-26 20:13
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
@@ -48,7 +47,7 @@ class Migration(migrations.Migration):
),
migrations.AlterUniqueTogether(
name='corpmember',
unique_together=set([('corpstats', 'character_id')]),
unique_together={('corpstats', 'character_id')},
),
migrations.RunPython(convert_json_to_members, convert_members_to_json),
migrations.RemoveField(

1
allianceauth/corputils/migrations/0005_cleanup_permissions.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.11.2 on 2017-06-10 15:34
from __future__ import unicode_literals
from django.db import migrations

10
allianceauth/corputils/models.py
View File

@@ -43,7 +43,7 @@ class CorpStats(models.Model):
objects = CorpStatsManager()
def __str__(self):
return "%s for %s" % (self.__class__.__name__, self.corp)
return f"{self.__class__.__name__} for {self.corp}"
def update(self):
try:
@@ -73,7 +73,7 @@ class CorpStats(models.Model):
self.save()
except TokenError as e:
logger.warning("%s failed to update: %s" % (self, e))
logger.warning(f"{self} failed to update: {e}")
if self.token.user:
notify(
self.token.user, "%s failed to update with your ESI token." % self,
@@ -81,9 +81,9 @@ class CorpStats(models.Model):
level="error")
self.delete()
except HTTPForbidden as e:
logger.warning("%s failed to update: %s" % (self, e))
logger.warning(f"{self} failed to update: {e}")
if self.token.user:
notify(self.token.user, "%s failed to update with your ESI token." % self, message="%s: %s" % (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("%s token character no longer in corp." % self)
@@ -99,7 +99,7 @@ class CorpStats(models.Model):
@property
def user_count(self):
return len(set([m.main_character for m in self.members.all() if m.main_character]))
return len({m.main_character for m in self.members.all() if m.main_character})
@property
def registered_member_count(self):

10
allianceauth/corputils/tests.py
View File

@@ -243,7 +243,7 @@ class CorpMemberTestCase(TestCase):
CharacterOwnership.objects.create(character=character, user=self.user, owner_hash='b')
self.member.refresh_from_db()
self.assertNotEqual(self.member.main_character, self.member.character)
self.assertEquals(self.member.main_character, self.user.profile.main_character)
self.assertEqual(self.member.main_character, self.user.profile.main_character)
# test when is main
old_main = self.user.profile.main_character
@@ -274,7 +274,7 @@ class CorpMemberTestCase(TestCase):
AuthUtils.connect_signals()
def test_portrait_url(self):
self.assertEquals(self.member.portrait_url(size=32), 'https://images.evetech.net/characters/2/portrait?size=32')
self.assertEquals(self.member.portrait_url(size=32), self.member.portrait_url_32)
self.assertEquals(self.member.portrait_url(size=64), self.member.portrait_url_64)
self.assertEquals(self.member.portrait_url(size=128), self.member.portrait_url_128)
self.assertEqual(self.member.portrait_url(size=32), 'https://images.evetech.net/characters/2/portrait?size=32')
self.assertEqual(self.member.portrait_url(size=32), self.member.portrait_url_32)
self.assertEqual(self.member.portrait_url(size=64), self.member.portrait_url_64)
self.assertEqual(self.member.portrait_url(size=128), self.member.portrait_url_128)