|
+ |
+
| {{ main.faction_name }} | +
-
+ {% if main.alliance_id %}
+
+ {% endif %}
+ {% if main.faction_id %}
+
+ {% endif %}
{{ main.character_name }}
{{ main.corporation_name }}
- {{ main.alliance_name }}
+ {% if main.alliance_id %}
+ {{ main.alliance_name }}
+ {% endif %}
+ {% if main.faction_id %}
+ {{ main.faction_name }}
+ {% endif %}
- {% trans "No main character set." %}
+ {% translate "No main character set." %}
{% endif %}
-
{% trans "Group Memberships" %}
+{% translate "Group Memberships" %}
@@ -118,7 +139,7 @@
- {% trans 'Characters' %} + {% translate 'Characters' %}
@@ -126,9 +147,9 @@
{% trans 'Name' %}
- {% trans 'Corp' %}
- {% trans 'Alliance' %}
+ {% translate 'Name' %}
+ {% translate 'Corp' %}
+ {% translate 'Alliance' %}
diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html
index 798c270f..9ca3fc9c 100644
--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@@ -12,7 +12,7 @@
{% include 'allianceauth/icons.html' %}
- {% block title %}{{ SITE_NAME }}{% endblock %}
+ {% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}
{% include 'bundles/bootstrap-css.html' %}
{% include 'bundles/fontawesome.html' %}
diff --git a/allianceauth/authentication/templates/public/login.html b/allianceauth/authentication/templates/public/login.html
index 9a7921e7..5460b330 100644
--- a/allianceauth/authentication/templates/public/login.html
+++ b/allianceauth/authentication/templates/public/login.html
@@ -1,6 +1,10 @@
{% extends 'public/middle_box.html' %}
+
+{% load i18n %}
{% load static %}
-{% block page_title %}Login{% endblock %}
+
+{% block page_title %}{% translate "Login" %}{% endblock %}
+
{% block middle_box_content %}
diff --git a/allianceauth/authentication/templates/public/middle_box.html b/allianceauth/authentication/templates/public/middle_box.html
index 005e86bf..cb127c36 100644
--- a/allianceauth/authentication/templates/public/middle_box.html
+++ b/allianceauth/authentication/templates/public/middle_box.html
@@ -1,6 +1,5 @@
{% extends 'public/base.html' %}
{% load static %}
-{% block title %}Login{% endblock %}
{% block content %}
diff --git a/allianceauth/authentication/templates/public/middle_box.html b/allianceauth/authentication/templates/public/middle_box.html
index 005e86bf..cb127c36 100644
--- a/allianceauth/authentication/templates/public/middle_box.html
+++ b/allianceauth/authentication/templates/public/middle_box.html
@@ -1,6 +1,5 @@
{% extends 'public/base.html' %}
{% load static %}
-{% block title %}Login{% endblock %}
{% block content %}
{% if messages %}
diff --git a/allianceauth/authentication/templates/public/register.html b/allianceauth/authentication/templates/public/register.html
index 05bc685b..9ddeea9d 100644
--- a/allianceauth/authentication/templates/public/register.html
+++ b/allianceauth/authentication/templates/public/register.html
@@ -1,13 +1,17 @@
{% extends 'public/base.html' %}
+
{% load static %}
{% load bootstrap %}
{% load i18n %}
-{% block page_title %}Registration{% endblock %}
+
+{% block page_title %}{% translate "Registration" %}{% endblock %}
+
{% block extra_include %}
{% include 'bundles/bootstrap-css.html' %}
{% include 'bundles/fontawesome.html' %}
{% include 'bundles/bootstrap-js.html' %}
{% endblock %}
+
{% block content %}
diff --git a/allianceauth/authentication/templates/registration/activate.html b/allianceauth/authentication/templates/registration/activate.html
index c5635df5..b5b9bfc1 100644
--- a/allianceauth/authentication/templates/registration/activate.html
+++ b/allianceauth/authentication/templates/registration/activate.html
@@ -1,5 +1,5 @@
{% extends 'public/middle_box.html' %}
{% load i18n %}
{% block middle_box_content %}
-
The X-Men" + self.assertEqual(user_main_organization(self.user_4), expected) + def test_characters_u1(self): expected = 'Batman, Bruce Wayne' result = self.modeladmin._characters(self.user_1) @@ -390,7 +419,7 @@ class TestUserAdmin(TestCaseWithTestData): # actions - @patch(MODULE_PATH + '.UserAdmin.message_user', auto_spec=True) + @patch(MODULE_PATH + '.UserAdmin.message_user', auto_spec=True, unsafe=True) @patch(MODULE_PATH + '.update_character') def test_action_update_main_character_model( self, mock_task, mock_message_user @@ -420,6 +449,7 @@ class TestUserAdmin(TestCaseWithTestData): expected = [ (2002, 'Daily Planet'), (2001, 'Wayne Technologies'), + (5432, "Xavier's School for Gifted Youngsters"), ] self.assertEqual(filterspec.lookup_choices, expected) @@ -463,6 +493,34 @@ class TestUserAdmin(TestCaseWithTestData): expected = [self.user_1] self.assertSetEqual(set(queryset), set(expected)) + def test_filter_main_factions(self): + class UserAdminTest(BaseUserAdmin): + list_filter = (MainFactionFilter,) + + my_modeladmin = UserAdminTest(User, AdminSite()) + + # Make sure the lookups are correct + request = self.factory.get('/') + request.user = self.user_4 + changelist = my_modeladmin.get_changelist_instance(request) + filters = changelist.get_filters(request) + filterspec = filters[0][0] + expected = [ + (999, 'The X-Men'), + ] + self.assertEqual(filterspec.lookup_choices, expected) + + # Make sure the correct queryset is returned + request = self.factory.get( + '/', + {'main_faction_id__exact': self.character_4.faction_id} + ) + request.user = self.user_4 + changelist = my_modeladmin.get_changelist_instance(request) + queryset = changelist.get_queryset(request) + expected = [self.user_4] + self.assertSetEqual(set(queryset), set(expected)) + def test_change_view_loads_normally(self): User.objects.create_superuser( username='superuser', password='secret', email='admin@example.com' diff --git a/allianceauth/authentication/tests/test_backend.py b/allianceauth/authentication/tests/test_backend.py index 212cae46..ed984521 100644 --- a/allianceauth/authentication/tests/test_backend.py +++ b/allianceauth/authentication/tests/test_backend.py @@ -114,12 +114,12 @@ class TestAuthenticate(TestCase): def test_authenticate_main_character(self): t = Token(character_id=self.main_character.character_id, character_owner_hash='1') user = StateBackend().authenticate(token=t) - self.assertEquals(user, self.user) + self.assertEqual(user, self.user) def test_authenticate_alt_character(self): t = Token(character_id=self.alt_character.character_id, character_owner_hash='2') user = StateBackend().authenticate(token=t) - self.assertEquals(user, self.user) + self.assertEqual(user, self.user) def test_authenticate_unclaimed_character(self): t = Token(character_id=self.unclaimed_character.character_id, character_name=self.unclaimed_character.character_name, character_owner_hash='3') diff --git a/allianceauth/authentication/tests/test_models.py b/allianceauth/authentication/tests/test_models.py index 485a3413..4dca31ff 100644 --- a/allianceauth/authentication/tests/test_models.py +++ b/allianceauth/authentication/tests/test_models.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import User from django.test import TestCase from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\ - EveAllianceInfo + EveAllianceInfo, EveFactionInfo from allianceauth.tests.auth_utils import AuthUtils from esi.errors import IncompleteResponseError from esi.models import Token @@ -36,8 +36,8 @@ class CharacterOwnershipTestCase(TestCase): character_owner_hash='1', ) co = CharacterOwnership.objects.get(character=self.character) - self.assertEquals(co.user, self.user) - self.assertEquals(co.owner_hash, '1') + self.assertEqual(co.user, self.user) + self.assertEqual(co.owner_hash, '1') def test_transfer_ownership(self): Token.objects.create( @@ -54,7 +54,7 @@ class CharacterOwnershipTestCase(TestCase): ) co = CharacterOwnership.objects.get(character=self.character) self.assertNotEqual(self.user, co.user) - self.assertEquals(self.alt_user, co.user) + self.assertEqual(self.alt_user, co.user) def test_clear_main_character(self): Token.objects.create( @@ -80,13 +80,15 @@ class StateTestCase(TestCase): def setUpTestData(cls): cls.user = AuthUtils.create_user('test_user', disconnect_signals=True) AuthUtils.add_main_character(cls.user, 'Test Character', '1', corp_id='1', alliance_id='1', - corp_name='Test Corp', alliance_name='Test Alliance') + corp_name='Test Corp', alliance_name='Test Alliance', faction_id=1337, + faction_name='Permabanned') cls.guest_state = get_guest_state() cls.test_character = EveCharacter.objects.get(character_id='1') cls.test_corporation = EveCorporationInfo.objects.create(corporation_id='1', corporation_name='Test Corp', corporation_ticker='TEST', member_count=1) cls.test_alliance = EveAllianceInfo.objects.create(alliance_id='1', alliance_name='Test Alliance', alliance_ticker='TEST', executor_corp_id='1') + cls.test_faction = EveFactionInfo.objects.create(faction_id=1337, faction_name='Permabanned') cls.member_state = State.objects.create( name='Test Member', priority=150, @@ -98,29 +100,38 @@ class StateTestCase(TestCase): def test_state_assignment_on_character_change(self): self.member_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) self.member_state.member_characters.remove(self.test_character) self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) def test_state_assignment_on_corporation_change(self): self.member_state.member_corporations.add(self.test_corporation) self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) self.member_state.member_corporations.remove(self.test_corporation) self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) def test_state_assignment_on_alliance_addition(self): self.member_state.member_alliances.add(self.test_alliance) self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) self.member_state.member_alliances.remove(self.test_alliance) self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) + + def test_state_assignment_on_faction_change(self): + self.member_state.member_factions.add(self.test_faction) + self._refresh_user() + self.assertEqual(self.user.profile.state, self.member_state) + + self.member_state.member_factions.remove(self.test_faction) + self._refresh_user() + self.assertEqual(self.user.profile.state, self.guest_state) def test_state_assignment_on_higher_priority_state_creation(self): self.member_state.member_characters.add(self.test_character) @@ -130,10 +141,10 @@ class StateTestCase(TestCase): ) higher_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(higher_state, self.user.profile.state) + self.assertEqual(higher_state, self.user.profile.state) higher_state.member_characters.clear() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) self.member_state.member_characters.clear() def test_state_assignment_on_lower_priority_state_creation(self): @@ -144,10 +155,10 @@ class StateTestCase(TestCase): ) lower_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) lower_state.member_characters.clear() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) self.member_state.member_characters.clear() def test_state_assignment_on_priority_change(self): @@ -161,11 +172,11 @@ class StateTestCase(TestCase): lower_state.priority = 500 lower_state.save() self._refresh_user() - self.assertEquals(lower_state, self.user.profile.state) + self.assertEqual(lower_state, self.user.profile.state) lower_state.priority = 125 lower_state.save() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) def test_state_assignment_on_state_deletion(self): self.member_state.member_characters.add(self.test_character) @@ -175,11 +186,11 @@ class StateTestCase(TestCase): ) higher_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(higher_state, self.user.profile.state) + self.assertEqual(higher_state, self.user.profile.state) higher_state.delete() self.assertFalse(State.objects.filter(name='Higher State').count()) self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) def test_state_assignment_on_public_toggle(self): self.member_state.member_characters.add(self.test_character) @@ -188,26 +199,26 @@ class StateTestCase(TestCase): priority=200, ) self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) higher_state.public = True higher_state.save() self._refresh_user() - self.assertEquals(higher_state, self.user.profile.state) + self.assertEqual(higher_state, self.user.profile.state) higher_state.public = False higher_state.save() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) def test_state_assignment_on_active_changed(self): self.member_state.member_characters.add(self.test_character) self.user.is_active = False self.user.save() self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) self.user.is_active = True self.user.save() self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) class CharacterOwnershipCheckTestCase(TestCase): diff --git a/allianceauth/authentication/tests/test_templatetags.py b/allianceauth/authentication/tests/test_templatetags.py index 5409f840..50361724 100644 --- a/allianceauth/authentication/tests/test_templatetags.py +++ b/allianceauth/authentication/tests/test_templatetags.py @@ -1,6 +1,7 @@ from math import ceil from unittest.mock import patch +import requests import requests_mock from packaging.version import Version as Pep440Version @@ -169,11 +170,7 @@ class TestVersionTags(TestCase): # when result = _current_version_summary() # then - self.assertTrue(result['latest_major']) - self.assertTrue(result['latest_minor']) self.assertTrue(result['latest_patch']) - self.assertEqual(result['latest_major_version'], '2.0.0') - self.assertEqual(result['latest_minor_version'], '2.4.0') self.assertEqual(result['latest_patch_version'], '2.4.5') self.assertEqual(result['latest_beta_version'], '2.4.6a1') @@ -222,9 +219,7 @@ class TestLatestsVersion(TestCase): tags = create_tags_list( ['2.1.1', '2.1.0', '2.0.0', '2.1.1a1', '1.1.1', '1.1.0', '1.0.0'] ) - major, minor, patch, beta = _latests_versions(tags) - self.assertEqual(major, Pep440Version('2.0.0')) - self.assertEqual(minor, Pep440Version('2.1.0')) + patch, beta = _latests_versions(tags) self.assertEqual(patch, Pep440Version('2.1.1')) self.assertEqual(beta, Pep440Version('2.1.1a1')) @@ -233,9 +228,7 @@ class TestLatestsVersion(TestCase): tags = create_tags_list( ['2.1.2', '2.1.1', '2.0.1', '2.1.1a1', '1.1.1', '1.1.0', '1.0.0'] ) - major, minor, patch, beta = _latests_versions(tags) - self.assertEqual(major, Pep440Version('2.0.1')) - self.assertEqual(minor, Pep440Version('2.1.1')) + patch, beta = _latests_versions(tags) self.assertEqual(patch, Pep440Version('2.1.2')) self.assertEqual(beta, Pep440Version('2.1.1a1')) @@ -244,9 +237,7 @@ class TestLatestsVersion(TestCase): tags = create_tags_list( ['2.1.1', '2.1.0', '2.0.0', '2.1.1a1', 'invalid'] ) - major, minor, patch, beta = _latests_versions(tags) - self.assertEqual(major, Pep440Version('2.0.0')) - self.assertEqual(minor, Pep440Version('2.1.0')) + patch, beta = _latests_versions(tags) self.assertEqual(patch, Pep440Version('2.1.1')) self.assertEqual(beta, Pep440Version('2.1.1a1')) @@ -317,3 +308,25 @@ class TestFetchListFromGitlab(TestCase): result = _fetch_list_from_gitlab(self.url, max_pages=max_pages) self.assertEqual(result, GITHUB_TAGS[:4]) self.assertEqual(requests_mocker.call_count, max_pages) + + @requests_mock.mock() + @patch(MODULE_PATH + '.admin_status.logger') + def test_should_not_raise_any_exception_from_github_request_but_log_as_warning( + self, requests_mocker, mock_logger + ): + for my_exception in [ + requests.exceptions.ConnectionError, + requests.exceptions.HTTPError, + requests.exceptions.URLRequired, + requests.exceptions.TooManyRedirects, + requests.exceptions.ConnectTimeout, + requests.exceptions.Timeout, + + ]: + requests_mocker.get(self.url, exc=my_exception) + try: + result = _fetch_list_from_gitlab(self.url) + except Exception as ex: + self.fail(f"Unexpected exception raised: {ex}") + self.assertTrue(mock_logger.warning.called) + self.assertListEqual(result, []) diff --git a/allianceauth/authentication/views.py b/allianceauth/authentication/views.py index b173ec9f..779f9a1c 100644 --- a/allianceauth/authentication/views.py +++ b/allianceauth/authentication/views.py @@ -6,8 +6,10 @@ from django.contrib.auth import login, authenticate from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.core import signing +from django.core.mail import EmailMultiAlternatives from django.http import JsonResponse 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 _ @@ -63,7 +65,7 @@ def dashboard(request): @login_required @token_required(scopes=settings.LOGIN_TOKEN_SCOPES) def main_character_change(request, token): - logger.debug("main_character_change called by user %s for character %s" % (request.user, token.character_name)) + logger.debug(f"main_character_change called by user {request.user} for character {token.character_name}") try: co = CharacterOwnership.objects.get(character__character_id=token.character_id, user=request.user) except CharacterOwnership.DoesNotExist: @@ -137,9 +139,52 @@ class RegistrationView(BaseRegistrationView): form_class = RegistrationForm template_name = "public/register.html" email_body_template = "registration/activation_email.txt" + email_body_template_html = "registration/activation_email_html.txt" email_subject_template = "registration/activation_email_subject.txt" success_url = reverse_lazy('registration_complete') + def send_activation_email(self, user): + """ + Implement our own way to send a mail to make sure we + send a RFC conform multipart email + :param user: + :type user: + """ + + activation_key = self.get_activation_key(user) + context = self.get_email_context(activation_key) + context["user"] = user + + # email subject + subject = render_to_string( + template_name=self.email_subject_template, + context=context, + request=self.request, + ) + subject = "".join(subject.splitlines()) + + # plaintext email body part + message = render_to_string( + template_name=self.email_body_template, + context=context, + request=self.request, + ) + + # html email body part + message_html = render_to_string( + template_name=self.email_body_template_html, + context=context, + request=self.request, + ) + + # send it + user.email_user( + subject, + message, + settings.DEFAULT_FROM_EMAIL, + **{'html_message': message_html}, + ) + def get_success_url(self, user): if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True): return reverse_lazy('authentication:dashboard') @@ -154,7 +199,7 @@ class RegistrationView(BaseRegistrationView): if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True): # Keep the request so the user can be automagically logged in. setattr(self, 'request', request) - return super(RegistrationView, self).dispatch(request, *args, **kwargs) + return super().dispatch(request, *args, **kwargs) def register(self, form): user = User.objects.get(pk=self.request.session.get('registration_uid')) @@ -173,7 +218,7 @@ class RegistrationView(BaseRegistrationView): return signing.dumps(obj=[getattr(user, User.USERNAME_FIELD), user.email], salt=REGISTRATION_SALT) def get_email_context(self, activation_key): - context = super(RegistrationView, self).get_email_context(activation_key) + context = super().get_email_context(activation_key) context['url'] = context['site'].domain + reverse('registration_activate', args=[activation_key]) return context diff --git a/allianceauth/bin/allianceauth.py b/allianceauth/bin/allianceauth.py index ae54e1fd..5d64601f 100644 --- a/allianceauth/bin/allianceauth.py +++ b/allianceauth/bin/allianceauth.py @@ -41,7 +41,7 @@ def create_project(parser, options, args): # Call the command with extra context call_command(StartProject(), *args, **command_options) - print("Success! %(project_name)s has been created." % {'project_name': args[0]}) # noqa + print(f"Success! {args[0]} has been created.") # noqa def update_settings(parser, options, args): @@ -69,10 +69,10 @@ def update_settings(parser, options, args): template_settings_path = os.path.join(template_path, 'project_name/settings/base.py') # overwrite the local project's base settings - with open(template_settings_path, 'r') as template, open(settings_path, 'w') as target: + with open(template_settings_path) as template, open(settings_path, 'w') as target: target.write(template.read()) - print("Successfully updated %(project_name)s settings." % {'project_name': project_name}) + print(f"Successfully updated {project_name} settings.") COMMANDS = { diff --git a/allianceauth/corputils/managers.py b/allianceauth/corputils/managers.py index 8607b613..87b2ffdd 100644 --- a/allianceauth/corputils/managers.py +++ b/allianceauth/corputils/managers.py @@ -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: diff --git a/allianceauth/corputils/migrations/0001_initial.py b/allianceauth/corputils/migrations/0001_initial.py index 7da61bdd..49d71b75 100644 --- a/allianceauth/corputils/migrations/0001_initial.py +++ b/allianceauth/corputils/migrations/0001_initial.py @@ -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 diff --git a/allianceauth/corputils/migrations/0002_migrate_permissions.py b/allianceauth/corputils/migrations/0002_migrate_permissions.py index 2c0e462d..fce155e4 100644 --- a/allianceauth/corputils/migrations/0002_migrate_permissions.py +++ b/allianceauth/corputils/migrations/0002_migrate_permissions.py @@ -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 diff --git a/allianceauth/corputils/migrations/0003_granular_permissions.py b/allianceauth/corputils/migrations/0003_granular_permissions.py index 8256106d..446a0c48 100644 --- a/allianceauth/corputils/migrations/0003_granular_permissions.py +++ b/allianceauth/corputils/migrations/0003_granular_permissions.py @@ -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 diff --git a/allianceauth/corputils/migrations/0004_member_models.py b/allianceauth/corputils/migrations/0004_member_models.py index 83b6b546..b8e2e291 100644 --- a/allianceauth/corputils/migrations/0004_member_models.py +++ b/allianceauth/corputils/migrations/0004_member_models.py @@ -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( diff --git a/allianceauth/corputils/migrations/0005_cleanup_permissions.py b/allianceauth/corputils/migrations/0005_cleanup_permissions.py index 27f8d73f..f73c37ca 100644 --- a/allianceauth/corputils/migrations/0005_cleanup_permissions.py +++ b/allianceauth/corputils/migrations/0005_cleanup_permissions.py @@ -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 diff --git a/allianceauth/corputils/models.py b/allianceauth/corputils/models.py index 8d7c6628..7ac03b7e 100644 --- a/allianceauth/corputils/models.py +++ b/allianceauth/corputils/models.py @@ -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): diff --git a/allianceauth/corputils/templates/corputils/base.html b/allianceauth/corputils/templates/corputils/base.html index d23bd86e..17300d94 100644 --- a/allianceauth/corputils/templates/corputils/base.html +++ b/allianceauth/corputils/templates/corputils/base.html @@ -1,15 +1,15 @@ {% extends 'allianceauth/base.html' %} {% load i18n %} -{% block page_title %}{% trans "Corporation Member Data" %}{% endblock %} +{% block page_title %}{% translate "Corporation Member Data" %}{% endblock %} {% block content %}
@@ -15,7 +19,7 @@
{% trans 'Invalid or expired activation link.' %}
+ {% translate 'Invalid or expired activation link.' %}
{% endblock %}
diff --git a/allianceauth/authentication/templates/registration/activation_email.txt b/allianceauth/authentication/templates/registration/activation_email.txt
index 028fbd2b..d303bf16 100644
--- a/allianceauth/authentication/templates/registration/activation_email.txt
+++ b/allianceauth/authentication/templates/registration/activation_email.txt
@@ -2,10 +2,6 @@ You're receiving this email because someone has entered this email address while
If this was you, please click on the link below to confirm your email address:
-Confirm email address
-
-Link not working? Try copy/pasting this URL into your browser:
-
{{ scheme }}://{{ url }}
This link will expire in {{ expiration_days }} day(s).
diff --git a/allianceauth/authentication/templates/registration/activation_email_html.txt b/allianceauth/authentication/templates/registration/activation_email_html.txt
new file mode 100644
index 00000000..907f2db9
--- /dev/null
+++ b/allianceauth/authentication/templates/registration/activation_email_html.txt
@@ -0,0 +1,19 @@
++ You're receiving this email because someone has entered this email address while registering for an account on {{ site.domain }} +
+ ++ If this was you, please click on the link below to confirm your email address: +
+ +
+ ++ This link will expire in {{ expiration_days }} day(s). +
+ ++ If this was not you, it is safe to ignore this email. +
diff --git a/allianceauth/authentication/templates/registration/password_reset_email.html b/allianceauth/authentication/templates/registration/password_reset_email.html index 6d66e74f..79d19b0e 100644 --- a/allianceauth/authentication/templates/registration/password_reset_email.html +++ b/allianceauth/authentication/templates/registration/password_reset_email.html @@ -2,13 +2,13 @@ {% blocktrans trimmed %}You're receiving this email because you requested a password reset for your user account.{% endblocktrans %} - {% trans "Please go to the following page and choose a new password:" %} + {% translate "Please go to the following page and choose a new password:" %} {% block reset_link %} {{domain}}{% url 'password_reset_confirm' uidb64=uid token=token %} {% endblock %} - {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} + {% translate "Your username, in case you've forgotten:" %} {{ user.get_username }} - {% trans "Thanks for using our site!" %} + {% translate "Thanks for using our site!" %} {% blocktrans %}Your IT Team{% endblocktrans %} diff --git a/allianceauth/authentication/templates/registration/registration_form.html b/allianceauth/authentication/templates/registration/registration_form.html index 12dbe6d2..5c35fe88 100644 --- a/allianceauth/authentication/templates/registration/registration_form.html +++ b/allianceauth/authentication/templates/registration/registration_form.html @@ -2,13 +2,13 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% block page_title %}Register{% endblock %} +{% block page_title %}{% translate "Register" %}{% endblock %} {% block middle_box_content %} {% endblock %} diff --git a/allianceauth/authentication/tests/test_admin.py b/allianceauth/authentication/tests/test_admin.py index 41d5a88b..e48f3623 100644 --- a/allianceauth/authentication/tests/test_admin.py +++ b/allianceauth/authentication/tests/test_admin.py @@ -9,7 +9,7 @@ from allianceauth.authentication.models import ( CharacterOwnership, State, OwnershipRecord ) from allianceauth.eveonline.models import ( - EveCharacter, EveCorporationInfo, EveAllianceInfo + EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo ) from allianceauth.services.hooks import ServicesHook from allianceauth.tests.auth_utils import AuthUtils @@ -20,6 +20,7 @@ from ..admin import ( StateAdmin, MainCorporationsFilter, MainAllianceFilter, + MainFactionFilter, OwnershipRecordAdmin, User, UserAdmin, @@ -36,7 +37,7 @@ from . import get_admin_change_view_url, get_admin_search_url MODULE_PATH = 'allianceauth.authentication.admin' -class MockRequest(object): +class MockRequest: def __init__(self, user=None): self.user = user @@ -180,6 +181,30 @@ class TestCaseWithTestData(TestCase): cls.user_3.is_superuser = True cls.user_3.save() + # user 4 - corp and faction, no alliance + cls.character_4 = EveCharacter.objects.create( + character_id=4321, + character_name='Professor X', + corporation_id=5432, + corporation_name="Xavier's School for Gifted Youngsters", + corporation_ticker='MUTNT', + alliance_id = None, + faction_id=999, + faction_name='The X-Men', + ) + cls.user_4 = User.objects.create_user( + cls.character_4.character_name.replace(' ', '_'), + 'abc@example.com', + 'password' + ) + CharacterOwnership.objects.create( + character=cls.character_4, + owner_hash='x1' + cls.character_4.character_name, + user=cls.user_4 + ) + cls.user_4.profile.main_character = cls.character_4 + cls.user_4.profile.save() + EveFactionInfo.objects.create(faction_id=999, faction_name='The X-Men') def make_generic_search_request(ModelClass: type, search_term: str): User.objects.create_superuser( @@ -188,7 +213,7 @@ def make_generic_search_request(ModelClass: type, search_term: str): c = Client() c.login(username='superuser', password='secret') return c.get( - '%s?q=%s' % (get_admin_search_url(ModelClass), quote(search_term)) + f'{get_admin_search_url(ModelClass)}?q={quote(search_term)}' ) @@ -315,9 +340,13 @@ class TestUserAdmin(TestCaseWithTestData): self.assertEqual(user_main_organization(self.user_2), expected) def test_user_main_organization_u3(self): - expected = None + expected = '' self.assertEqual(user_main_organization(self.user_3), expected) + def test_user_main_organization_u4(self): + expected="Xavier's School for Gifted YoungstersThe X-Men" + self.assertEqual(user_main_organization(self.user_4), expected) + def test_characters_u1(self): expected = 'Batman, Bruce Wayne' result = self.modeladmin._characters(self.user_1) @@ -390,7 +419,7 @@ class TestUserAdmin(TestCaseWithTestData): # actions - @patch(MODULE_PATH + '.UserAdmin.message_user', auto_spec=True) + @patch(MODULE_PATH + '.UserAdmin.message_user', auto_spec=True, unsafe=True) @patch(MODULE_PATH + '.update_character') def test_action_update_main_character_model( self, mock_task, mock_message_user @@ -420,6 +449,7 @@ class TestUserAdmin(TestCaseWithTestData): expected = [ (2002, 'Daily Planet'), (2001, 'Wayne Technologies'), + (5432, "Xavier's School for Gifted Youngsters"), ] self.assertEqual(filterspec.lookup_choices, expected) @@ -463,6 +493,34 @@ class TestUserAdmin(TestCaseWithTestData): expected = [self.user_1] self.assertSetEqual(set(queryset), set(expected)) + def test_filter_main_factions(self): + class UserAdminTest(BaseUserAdmin): + list_filter = (MainFactionFilter,) + + my_modeladmin = UserAdminTest(User, AdminSite()) + + # Make sure the lookups are correct + request = self.factory.get('/') + request.user = self.user_4 + changelist = my_modeladmin.get_changelist_instance(request) + filters = changelist.get_filters(request) + filterspec = filters[0][0] + expected = [ + (999, 'The X-Men'), + ] + self.assertEqual(filterspec.lookup_choices, expected) + + # Make sure the correct queryset is returned + request = self.factory.get( + '/', + {'main_faction_id__exact': self.character_4.faction_id} + ) + request.user = self.user_4 + changelist = my_modeladmin.get_changelist_instance(request) + queryset = changelist.get_queryset(request) + expected = [self.user_4] + self.assertSetEqual(set(queryset), set(expected)) + def test_change_view_loads_normally(self): User.objects.create_superuser( username='superuser', password='secret', email='admin@example.com' diff --git a/allianceauth/authentication/tests/test_backend.py b/allianceauth/authentication/tests/test_backend.py index 212cae46..ed984521 100644 --- a/allianceauth/authentication/tests/test_backend.py +++ b/allianceauth/authentication/tests/test_backend.py @@ -114,12 +114,12 @@ class TestAuthenticate(TestCase): def test_authenticate_main_character(self): t = Token(character_id=self.main_character.character_id, character_owner_hash='1') user = StateBackend().authenticate(token=t) - self.assertEquals(user, self.user) + self.assertEqual(user, self.user) def test_authenticate_alt_character(self): t = Token(character_id=self.alt_character.character_id, character_owner_hash='2') user = StateBackend().authenticate(token=t) - self.assertEquals(user, self.user) + self.assertEqual(user, self.user) def test_authenticate_unclaimed_character(self): t = Token(character_id=self.unclaimed_character.character_id, character_name=self.unclaimed_character.character_name, character_owner_hash='3') diff --git a/allianceauth/authentication/tests/test_models.py b/allianceauth/authentication/tests/test_models.py index 485a3413..4dca31ff 100644 --- a/allianceauth/authentication/tests/test_models.py +++ b/allianceauth/authentication/tests/test_models.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import User from django.test import TestCase from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\ - EveAllianceInfo + EveAllianceInfo, EveFactionInfo from allianceauth.tests.auth_utils import AuthUtils from esi.errors import IncompleteResponseError from esi.models import Token @@ -36,8 +36,8 @@ class CharacterOwnershipTestCase(TestCase): character_owner_hash='1', ) co = CharacterOwnership.objects.get(character=self.character) - self.assertEquals(co.user, self.user) - self.assertEquals(co.owner_hash, '1') + self.assertEqual(co.user, self.user) + self.assertEqual(co.owner_hash, '1') def test_transfer_ownership(self): Token.objects.create( @@ -54,7 +54,7 @@ class CharacterOwnershipTestCase(TestCase): ) co = CharacterOwnership.objects.get(character=self.character) self.assertNotEqual(self.user, co.user) - self.assertEquals(self.alt_user, co.user) + self.assertEqual(self.alt_user, co.user) def test_clear_main_character(self): Token.objects.create( @@ -80,13 +80,15 @@ class StateTestCase(TestCase): def setUpTestData(cls): cls.user = AuthUtils.create_user('test_user', disconnect_signals=True) AuthUtils.add_main_character(cls.user, 'Test Character', '1', corp_id='1', alliance_id='1', - corp_name='Test Corp', alliance_name='Test Alliance') + corp_name='Test Corp', alliance_name='Test Alliance', faction_id=1337, + faction_name='Permabanned') cls.guest_state = get_guest_state() cls.test_character = EveCharacter.objects.get(character_id='1') cls.test_corporation = EveCorporationInfo.objects.create(corporation_id='1', corporation_name='Test Corp', corporation_ticker='TEST', member_count=1) cls.test_alliance = EveAllianceInfo.objects.create(alliance_id='1', alliance_name='Test Alliance', alliance_ticker='TEST', executor_corp_id='1') + cls.test_faction = EveFactionInfo.objects.create(faction_id=1337, faction_name='Permabanned') cls.member_state = State.objects.create( name='Test Member', priority=150, @@ -98,29 +100,38 @@ class StateTestCase(TestCase): def test_state_assignment_on_character_change(self): self.member_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) self.member_state.member_characters.remove(self.test_character) self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) def test_state_assignment_on_corporation_change(self): self.member_state.member_corporations.add(self.test_corporation) self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) self.member_state.member_corporations.remove(self.test_corporation) self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) def test_state_assignment_on_alliance_addition(self): self.member_state.member_alliances.add(self.test_alliance) self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) self.member_state.member_alliances.remove(self.test_alliance) self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) + + def test_state_assignment_on_faction_change(self): + self.member_state.member_factions.add(self.test_faction) + self._refresh_user() + self.assertEqual(self.user.profile.state, self.member_state) + + self.member_state.member_factions.remove(self.test_faction) + self._refresh_user() + self.assertEqual(self.user.profile.state, self.guest_state) def test_state_assignment_on_higher_priority_state_creation(self): self.member_state.member_characters.add(self.test_character) @@ -130,10 +141,10 @@ class StateTestCase(TestCase): ) higher_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(higher_state, self.user.profile.state) + self.assertEqual(higher_state, self.user.profile.state) higher_state.member_characters.clear() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) self.member_state.member_characters.clear() def test_state_assignment_on_lower_priority_state_creation(self): @@ -144,10 +155,10 @@ class StateTestCase(TestCase): ) lower_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) lower_state.member_characters.clear() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) self.member_state.member_characters.clear() def test_state_assignment_on_priority_change(self): @@ -161,11 +172,11 @@ class StateTestCase(TestCase): lower_state.priority = 500 lower_state.save() self._refresh_user() - self.assertEquals(lower_state, self.user.profile.state) + self.assertEqual(lower_state, self.user.profile.state) lower_state.priority = 125 lower_state.save() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) def test_state_assignment_on_state_deletion(self): self.member_state.member_characters.add(self.test_character) @@ -175,11 +186,11 @@ class StateTestCase(TestCase): ) higher_state.member_characters.add(self.test_character) self._refresh_user() - self.assertEquals(higher_state, self.user.profile.state) + self.assertEqual(higher_state, self.user.profile.state) higher_state.delete() self.assertFalse(State.objects.filter(name='Higher State').count()) self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) def test_state_assignment_on_public_toggle(self): self.member_state.member_characters.add(self.test_character) @@ -188,26 +199,26 @@ class StateTestCase(TestCase): priority=200, ) self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) higher_state.public = True higher_state.save() self._refresh_user() - self.assertEquals(higher_state, self.user.profile.state) + self.assertEqual(higher_state, self.user.profile.state) higher_state.public = False higher_state.save() self._refresh_user() - self.assertEquals(self.member_state, self.user.profile.state) + self.assertEqual(self.member_state, self.user.profile.state) def test_state_assignment_on_active_changed(self): self.member_state.member_characters.add(self.test_character) self.user.is_active = False self.user.save() self._refresh_user() - self.assertEquals(self.user.profile.state, self.guest_state) + self.assertEqual(self.user.profile.state, self.guest_state) self.user.is_active = True self.user.save() self._refresh_user() - self.assertEquals(self.user.profile.state, self.member_state) + self.assertEqual(self.user.profile.state, self.member_state) class CharacterOwnershipCheckTestCase(TestCase): diff --git a/allianceauth/authentication/tests/test_templatetags.py b/allianceauth/authentication/tests/test_templatetags.py index 5409f840..50361724 100644 --- a/allianceauth/authentication/tests/test_templatetags.py +++ b/allianceauth/authentication/tests/test_templatetags.py @@ -1,6 +1,7 @@ from math import ceil from unittest.mock import patch +import requests import requests_mock from packaging.version import Version as Pep440Version @@ -169,11 +170,7 @@ class TestVersionTags(TestCase): # when result = _current_version_summary() # then - self.assertTrue(result['latest_major']) - self.assertTrue(result['latest_minor']) self.assertTrue(result['latest_patch']) - self.assertEqual(result['latest_major_version'], '2.0.0') - self.assertEqual(result['latest_minor_version'], '2.4.0') self.assertEqual(result['latest_patch_version'], '2.4.5') self.assertEqual(result['latest_beta_version'], '2.4.6a1') @@ -222,9 +219,7 @@ class TestLatestsVersion(TestCase): tags = create_tags_list( ['2.1.1', '2.1.0', '2.0.0', '2.1.1a1', '1.1.1', '1.1.0', '1.0.0'] ) - major, minor, patch, beta = _latests_versions(tags) - self.assertEqual(major, Pep440Version('2.0.0')) - self.assertEqual(minor, Pep440Version('2.1.0')) + patch, beta = _latests_versions(tags) self.assertEqual(patch, Pep440Version('2.1.1')) self.assertEqual(beta, Pep440Version('2.1.1a1')) @@ -233,9 +228,7 @@ class TestLatestsVersion(TestCase): tags = create_tags_list( ['2.1.2', '2.1.1', '2.0.1', '2.1.1a1', '1.1.1', '1.1.0', '1.0.0'] ) - major, minor, patch, beta = _latests_versions(tags) - self.assertEqual(major, Pep440Version('2.0.1')) - self.assertEqual(minor, Pep440Version('2.1.1')) + patch, beta = _latests_versions(tags) self.assertEqual(patch, Pep440Version('2.1.2')) self.assertEqual(beta, Pep440Version('2.1.1a1')) @@ -244,9 +237,7 @@ class TestLatestsVersion(TestCase): tags = create_tags_list( ['2.1.1', '2.1.0', '2.0.0', '2.1.1a1', 'invalid'] ) - major, minor, patch, beta = _latests_versions(tags) - self.assertEqual(major, Pep440Version('2.0.0')) - self.assertEqual(minor, Pep440Version('2.1.0')) + patch, beta = _latests_versions(tags) self.assertEqual(patch, Pep440Version('2.1.1')) self.assertEqual(beta, Pep440Version('2.1.1a1')) @@ -317,3 +308,25 @@ class TestFetchListFromGitlab(TestCase): result = _fetch_list_from_gitlab(self.url, max_pages=max_pages) self.assertEqual(result, GITHUB_TAGS[:4]) self.assertEqual(requests_mocker.call_count, max_pages) + + @requests_mock.mock() + @patch(MODULE_PATH + '.admin_status.logger') + def test_should_not_raise_any_exception_from_github_request_but_log_as_warning( + self, requests_mocker, mock_logger + ): + for my_exception in [ + requests.exceptions.ConnectionError, + requests.exceptions.HTTPError, + requests.exceptions.URLRequired, + requests.exceptions.TooManyRedirects, + requests.exceptions.ConnectTimeout, + requests.exceptions.Timeout, + + ]: + requests_mocker.get(self.url, exc=my_exception) + try: + result = _fetch_list_from_gitlab(self.url) + except Exception as ex: + self.fail(f"Unexpected exception raised: {ex}") + self.assertTrue(mock_logger.warning.called) + self.assertListEqual(result, []) diff --git a/allianceauth/authentication/views.py b/allianceauth/authentication/views.py index b173ec9f..779f9a1c 100644 --- a/allianceauth/authentication/views.py +++ b/allianceauth/authentication/views.py @@ -6,8 +6,10 @@ from django.contrib.auth import login, authenticate from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.core import signing +from django.core.mail import EmailMultiAlternatives from django.http import JsonResponse 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 _ @@ -63,7 +65,7 @@ def dashboard(request): @login_required @token_required(scopes=settings.LOGIN_TOKEN_SCOPES) def main_character_change(request, token): - logger.debug("main_character_change called by user %s for character %s" % (request.user, token.character_name)) + logger.debug(f"main_character_change called by user {request.user} for character {token.character_name}") try: co = CharacterOwnership.objects.get(character__character_id=token.character_id, user=request.user) except CharacterOwnership.DoesNotExist: @@ -137,9 +139,52 @@ class RegistrationView(BaseRegistrationView): form_class = RegistrationForm template_name = "public/register.html" email_body_template = "registration/activation_email.txt" + email_body_template_html = "registration/activation_email_html.txt" email_subject_template = "registration/activation_email_subject.txt" success_url = reverse_lazy('registration_complete') + def send_activation_email(self, user): + """ + Implement our own way to send a mail to make sure we + send a RFC conform multipart email + :param user: + :type user: + """ + + activation_key = self.get_activation_key(user) + context = self.get_email_context(activation_key) + context["user"] = user + + # email subject + subject = render_to_string( + template_name=self.email_subject_template, + context=context, + request=self.request, + ) + subject = "".join(subject.splitlines()) + + # plaintext email body part + message = render_to_string( + template_name=self.email_body_template, + context=context, + request=self.request, + ) + + # html email body part + message_html = render_to_string( + template_name=self.email_body_template_html, + context=context, + request=self.request, + ) + + # send it + user.email_user( + subject, + message, + settings.DEFAULT_FROM_EMAIL, + **{'html_message': message_html}, + ) + def get_success_url(self, user): if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True): return reverse_lazy('authentication:dashboard') @@ -154,7 +199,7 @@ class RegistrationView(BaseRegistrationView): if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True): # Keep the request so the user can be automagically logged in. setattr(self, 'request', request) - return super(RegistrationView, self).dispatch(request, *args, **kwargs) + return super().dispatch(request, *args, **kwargs) def register(self, form): user = User.objects.get(pk=self.request.session.get('registration_uid')) @@ -173,7 +218,7 @@ class RegistrationView(BaseRegistrationView): return signing.dumps(obj=[getattr(user, User.USERNAME_FIELD), user.email], salt=REGISTRATION_SALT) def get_email_context(self, activation_key): - context = super(RegistrationView, self).get_email_context(activation_key) + context = super().get_email_context(activation_key) context['url'] = context['site'].domain + reverse('registration_activate', args=[activation_key]) return context diff --git a/allianceauth/bin/allianceauth.py b/allianceauth/bin/allianceauth.py index ae54e1fd..5d64601f 100644 --- a/allianceauth/bin/allianceauth.py +++ b/allianceauth/bin/allianceauth.py @@ -41,7 +41,7 @@ def create_project(parser, options, args): # Call the command with extra context call_command(StartProject(), *args, **command_options) - print("Success! %(project_name)s has been created." % {'project_name': args[0]}) # noqa + print(f"Success! {args[0]} has been created.") # noqa def update_settings(parser, options, args): @@ -69,10 +69,10 @@ def update_settings(parser, options, args): template_settings_path = os.path.join(template_path, 'project_name/settings/base.py') # overwrite the local project's base settings - with open(template_settings_path, 'r') as template, open(settings_path, 'w') as target: + with open(template_settings_path) as template, open(settings_path, 'w') as target: target.write(template.read()) - print("Successfully updated %(project_name)s settings." % {'project_name': project_name}) + print(f"Successfully updated {project_name} settings.") COMMANDS = { diff --git a/allianceauth/corputils/managers.py b/allianceauth/corputils/managers.py index 8607b613..87b2ffdd 100644 --- a/allianceauth/corputils/managers.py +++ b/allianceauth/corputils/managers.py @@ -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: diff --git a/allianceauth/corputils/migrations/0001_initial.py b/allianceauth/corputils/migrations/0001_initial.py index 7da61bdd..49d71b75 100644 --- a/allianceauth/corputils/migrations/0001_initial.py +++ b/allianceauth/corputils/migrations/0001_initial.py @@ -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 diff --git a/allianceauth/corputils/migrations/0002_migrate_permissions.py b/allianceauth/corputils/migrations/0002_migrate_permissions.py index 2c0e462d..fce155e4 100644 --- a/allianceauth/corputils/migrations/0002_migrate_permissions.py +++ b/allianceauth/corputils/migrations/0002_migrate_permissions.py @@ -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 diff --git a/allianceauth/corputils/migrations/0003_granular_permissions.py b/allianceauth/corputils/migrations/0003_granular_permissions.py index 8256106d..446a0c48 100644 --- a/allianceauth/corputils/migrations/0003_granular_permissions.py +++ b/allianceauth/corputils/migrations/0003_granular_permissions.py @@ -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 diff --git a/allianceauth/corputils/migrations/0004_member_models.py b/allianceauth/corputils/migrations/0004_member_models.py index 83b6b546..b8e2e291 100644 --- a/allianceauth/corputils/migrations/0004_member_models.py +++ b/allianceauth/corputils/migrations/0004_member_models.py @@ -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( diff --git a/allianceauth/corputils/migrations/0005_cleanup_permissions.py b/allianceauth/corputils/migrations/0005_cleanup_permissions.py index 27f8d73f..f73c37ca 100644 --- a/allianceauth/corputils/migrations/0005_cleanup_permissions.py +++ b/allianceauth/corputils/migrations/0005_cleanup_permissions.py @@ -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 diff --git a/allianceauth/corputils/models.py b/allianceauth/corputils/models.py index 8d7c6628..7ac03b7e 100644 --- a/allianceauth/corputils/models.py +++ b/allianceauth/corputils/models.py @@ -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): diff --git a/allianceauth/corputils/templates/corputils/base.html b/allianceauth/corputils/templates/corputils/base.html index d23bd86e..17300d94 100644 --- a/allianceauth/corputils/templates/corputils/base.html +++ b/allianceauth/corputils/templates/corputils/base.html @@ -1,15 +1,15 @@ {% extends 'allianceauth/base.html' %} {% load i18n %} -{% block page_title %}{% trans "Corporation Member Data" %}{% endblock %} +{% block page_title %}{% translate "Corporation Member Data" %}{% endblock %} {% block content %}
-