[damned-lies] refactor: fix few linter issues in teams
- From: Claude Paroz <claudep src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [damned-lies] refactor: fix few linter issues in teams
- Date: Sat, 24 Apr 2021 08:42:17 +0000 (UTC)
commit 23001911bc3570600dc4a20180b07b3668ee96d5
Author: Guillaume Bernard <associations guillaume-bernard fr>
Date: Sun Apr 18 18:23:06 2021 +0200
refactor: fix few linter issues in teams
teams/forms.py | 14 +++++++++----
teams/models.py | 13 ++++++------
teams/views.py | 63 ++++++++++++++++++++++++++++++++-------------------------
3 files changed, 52 insertions(+), 38 deletions(-)
---
diff --git a/teams/forms.py b/teams/forms.py
index 9b7aaf02..a8622a49 100644
--- a/teams/forms.py
+++ b/teams/forms.py
@@ -22,7 +22,9 @@ class EditTeamDetailsForm(forms.ModelForm):
self.user = user
if is_site_admin(user):
# Add coordinatorship dropdown
- all_members = [(r.id, r.person.name) for r in
Role.objects.select_related('person').filter(team=self.instance)]
+ all_members = [
+ (r.id, r.person.name) for r in
Role.objects.select_related('person').filter(team=self.instance)
+ ]
all_members.insert(0, ('', '-------'))
try:
current_coord_pk = Role.objects.filter(team=self.instance, role='coordinator')[0].pk
@@ -71,7 +73,7 @@ class EditMemberRoleForm(forms.Form):
self.fields['form_type'] = forms.CharField(widget=forms.HiddenInput, initial=roles[0].role)
def get_fields(self):
- for key, field in self.fields.items():
+ for key in self.fields:
if key not in ('form_type',):
yield self[key]
@@ -87,7 +89,9 @@ class EditMemberRoleForm(forms.Form):
'team': team,
'site': settings.SITE_DOMAIN,
}
- message += "\n\n" + _("This is an automatic message sent from %(site)s. Please do not
answer.") % {'site': settings.SITE_DOMAIN}
+ message += "\n\n" + _("This is an automatic message sent from %(site)s. Please do not
answer.") % {
+ 'site': settings.SITE_DOMAIN
+ }
send_mail(_('Removed from team'), message, to=[role.person.email])
elif form_value == "inactivate":
role.is_active = False
@@ -100,5 +104,7 @@ class EditMemberRoleForm(forms.Form):
'site': settings.SITE_DOMAIN,
'role': role.get_role_display(),
}
- message += "\n\n" + _("This is an automatic message sent from %(site)s. Please do not
answer.") % {'site': settings.SITE_DOMAIN}
+ message += "\n\n" + _("This is an automatic message sent from %(site)s. Please do not
answer.") % {
+ 'site': settings.SITE_DOMAIN
+ }
send_mail(_('Role changed'), message, to=[role.person.email])
diff --git a/teams/models.py b/teams/models.py
index b16e6e63..32ba8b61 100644
--- a/teams/models.py
+++ b/teams/models.py
@@ -171,14 +171,14 @@ class Team(models.Model):
role__is_active=False))
return members
- def send_mail_to_coordinator(self, subject, message, messagekw={}):
+ def send_mail_to_coordinator(self, subject, message, messagekw=None):
""" Send a message to the coordinator, in her language if available
and if subject and message are lazy strings """
recipients = [pers.email for pers in self.get_coordinators() if pers.email]
if not recipients:
return
with translation.override(self.language_set.first().locale):
- message = "%s\n--\n" % (message % messagekw,)
+ message = "%s\n--\n" % (message % (messagekw or {}),)
message += _("This is an automated message sent from %s.") % settings.SITE_DOMAIN
send_mail(
str(subject), message, to=recipients,
@@ -241,7 +241,8 @@ class Role(models.Model):
@classmethod
def inactivate_unused_roles(cls):
- """ Inactivate the roles when login older than 180 days """
- last_login = datetime.now() - timedelta(days=30*6)
- cls.objects.filter(person__last_login__lt=last_login,
- is_active=True).update(is_active=False)
+ """ Inactivate the roles when login older than 180 days """
+ last_login = datetime.now() - timedelta(days=30 * 6)
+ cls.objects.filter(
+ person__last_login__lt=last_login, is_active=True
+ ).update(is_active=False)
diff --git a/teams/views.py b/teams/views.py
index 1859fef7..91fa28d8 100644
--- a/teams/views.py
+++ b/teams/views.py
@@ -8,48 +8,54 @@ from teams.models import Team, FakeTeam, Role
from teams.forms import EditMemberRoleForm, EditTeamDetailsForm
from languages.models import Language
+
def teams(request, format='html'):
teams = Team.objects.all_with_coordinator()
format = request.GET.get('format') or format
if format in ('xml', 'json'):
- return render(request, 'teams/team_list.%s' % format, {'teams': teams},
+ return render(
+ request, 'teams/team_list.%s' % format, {'teams': teams},
content_type=utils.MIME_TYPES[format]
)
- else:
- context = {
- 'pageSection': 'teams',
- 'teams': utils.trans_sort_object_list(teams, 'description'),
- }
- return render(request, 'teams/team_list.html', context)
+ context = {
+ 'pageSection': 'teams',
+ 'teams': utils.trans_sort_object_list(teams, 'description'),
+ }
+ return render(request, 'teams/team_list.html', context)
+
def team(request, team_slug):
try:
team = Team.objects.get(name=team_slug)
mem_groups = (
- {'id': 'committers',
- 'title': _("Committers"),
- 'members': team.get_committers_exact(),
- 'form': None,
- 'no_member': _("No committers")
- },
- {'id': 'reviewers',
- 'title': _("Reviewers"),
- 'members': team.get_reviewers_exact(),
- 'form': None,
- 'no_member': _("No reviewers")
+ {
+ 'id': 'committers',
+ 'title': _("Committers"),
+ 'members': team.get_committers_exact(),
+ 'form': None,
+ 'no_member': _("No committers")
},
- {'id': 'translators',
- 'title': _("Translators"),
- 'members': team.get_translators_exact(),
- 'form': None,
- 'no_member': _("No translators")
+ {
+ 'id': 'reviewers',
+ 'title': _("Reviewers"),
+ 'members': team.get_reviewers_exact(),
+ 'form': None,
+ 'no_member': _("No reviewers")
},
- {'id': 'inactive',
- 'title': _("Inactive members"),
- 'members': team.get_inactive_members(),
- 'form': None,
- 'no_member': _("No inactive members")
+ {
+ 'id': 'translators',
+ 'title': _("Translators"),
+ 'members': team.get_translators_exact(),
+ 'form': None,
+ 'no_member': _("No translators")
},
+ {
+ 'id': 'inactive',
+ 'title': _("Inactive members"),
+ 'members': team.get_inactive_members(),
+ 'form': None,
+ 'no_member': _("No inactive members")
+ }
)
except Team.DoesNotExist:
lang = get_object_or_404(Language, locale=team_slug)
@@ -84,6 +90,7 @@ def team(request, team_slug):
context['can_edit_details'] = context['can_edit_team'] or utils.is_site_admin(request.user)
return render(request, 'teams/team_detail.html', context)
+
def team_edit(request, team_slug):
team = get_object_or_404(Team, name=team_slug)
if not (team.can_edit(request.user) or utils.is_site_admin(request.user)):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]