mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-09 16:46:20 +01:00
update code to reflect the new minimum python version 3.7
- 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:
@@ -30,7 +30,7 @@ class TimerForm(forms.ModelForm):
|
||||
if 'minutes_left' not in initial:
|
||||
initial.update({'minutes_left': td.seconds // 60 % 60})
|
||||
kwargs.update({'initial': initial})
|
||||
super(TimerForm, self).__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
structure_choices = [('POCO', 'POCO'),
|
||||
('I-HUB', 'I-HUB'),
|
||||
@@ -69,7 +69,7 @@ class TimerForm(forms.ModelForm):
|
||||
corp_timer = forms.BooleanField(label=_("Corp-Restricted"), required=False)
|
||||
|
||||
def save(self, commit=True):
|
||||
timer = super(TimerForm, self).save(commit=False)
|
||||
timer = super().save(commit=False)
|
||||
|
||||
# Get character
|
||||
character = self.user.profile.main_character
|
||||
@@ -82,7 +82,7 @@ class TimerForm(forms.ModelForm):
|
||||
current_time = timezone.now()
|
||||
eve_time = current_time + future_time
|
||||
logger.debug(
|
||||
"Determined timer eve time is %s - current time %s, adding %s" % (eve_time, current_time, future_time))
|
||||
f"Determined timer eve time is {eve_time} - current time {current_time}, adding {future_time}")
|
||||
|
||||
timer.eve_time = eve_time
|
||||
timer.eve_character = character
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
# Generated by Django 1.10.1 on 2016-09-05 21:40
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
@@ -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, models
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
# Generated by Django 1.11.5 on 2017-09-28 02:16
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
@@ -26,7 +26,7 @@ class TimerView(BaseTimerView):
|
||||
permission_required = 'auth.timer_view'
|
||||
|
||||
def get(self, request):
|
||||
logger.debug("timer_view called by user {}".format(request.user))
|
||||
logger.debug(f"timer_view called by user {request.user}")
|
||||
char = request.user.profile.main_character
|
||||
if char:
|
||||
corp = char.corporation
|
||||
@@ -59,7 +59,7 @@ class AddUpdateMixin:
|
||||
"""
|
||||
Inject the request user into the kwargs passed to the form
|
||||
"""
|
||||
kwargs = super(AddUpdateMixin, self).get_form_kwargs()
|
||||
kwargs = super().get_form_kwargs()
|
||||
kwargs.update({'user': self.request.user})
|
||||
return kwargs
|
||||
|
||||
@@ -68,9 +68,9 @@ class AddTimerView(TimerManagementView, AddUpdateMixin, CreateView):
|
||||
template_name_suffix = '_create_form'
|
||||
|
||||
def form_valid(self, form):
|
||||
result = super(AddTimerView, self).form_valid(form)
|
||||
result = super().form_valid(form)
|
||||
timer = self.object
|
||||
logger.info("Created new timer in {} at {} by user {}".format(timer.system, timer.eve_time, self.request.user))
|
||||
logger.info(f"Created new timer in {timer.system} at {timer.eve_time} by user {self.request.user}")
|
||||
messages.success(self.request, _('Added new timer in %(system)s at %(time)s.') % {"system": timer.system, "time": timer.eve_time})
|
||||
return result
|
||||
|
||||
@@ -80,7 +80,7 @@ class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView):
|
||||
|
||||
def form_valid(self, form):
|
||||
messages.success(self.request, _('Saved changes to the timer.'))
|
||||
return super(EditTimerView, self).form_valid(form)
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
class RemoveTimerView(TimerManagementView, DeleteView):
|
||||
|
||||
Reference in New Issue
Block a user