diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a68660232cc8577a5e71112c265fdac86ec53268..3b60f5a10d7fe12befbde1ab3f14015671b8f656 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,4 +52,3 @@ pylint: - pip install -U pylint pylint-django script: - make pylint - allow_failure: true diff --git a/management/forms.py b/management/forms.py index 2991618ded8f07888446a5fe88e8307c2bb14a48..3fd7895474622097fe503140a14d7df9dc00546b 100644 --- a/management/forms.py +++ b/management/forms.py @@ -66,7 +66,7 @@ class TemplateStringForm: cleaned_text.format(**test_data_dict) except (KeyError, ValueError, IndexError): x = re.findall(r"\{\w*\}", cleaned_text) - test_data = set(x) - set([f"{{{i}}}" for i in test_data]) + test_data = set(x) - {f"{{{i}}}" for i in test_data} self.add_error(field, "The following variables are not allowed: " + ", ".join(test_data)) return cleaned_text @@ -136,7 +136,7 @@ class AddSessionForm(forms.ModelForm, TemplateStringForm): self.instance.save() self._save_m2m() else: - self.save_m2m = self._save_m2m + self.save_m2m = self._save_m2m # pylint: disable=attribute-defined-outside-init return self.instance @@ -179,7 +179,7 @@ class SessionSettingsForm(AddSessionForm): self.instance.save() self._save_m2m() else: - self.save_m2m = self._save_m2m + self.save_m2m = self._save_m2m # pylint: disable=attribute-defined-outside-init return self.instance @@ -334,7 +334,7 @@ class AddVotersForm(forms.Form): emails.append(line) - if not len(emails) == len(set(emails)): + if len(emails) != len(set(emails)): raise forms.ValidationError('duplicate email address') return emails diff --git a/management/views.py b/management/views.py index 123d5414f14dd5d276ca07fb865ac7b1c85a5aa6..14b45c7789694328ed03b79e10f9bd43f2ec05a3 100644 --- a/management/views.py +++ b/management/views.py @@ -210,7 +210,7 @@ def _unpack(request, pk): @management_login_required def election_detail(request, pk): - manager, election, session = _unpack(request, pk) + _, election, session = _unpack(request, pk) context = { 'election': election, 'session': session, @@ -248,7 +248,7 @@ def election_detail(request, pk): @management_login_required def election_upload_application(request, pk, application_id=None): - manager, election, meeting = _unpack(request, pk) + _, election, _ = _unpack(request, pk) if not election.can_apply: messages.add_message(request, messages.ERROR, 'Applications are currently not accepted') diff --git a/vote/forms.py b/vote/forms.py index 501548cb25633649050af9669871844500acae29..2f35889c15a89558fc137e15e4e3524cb1a2eedf 100644 --- a/vote/forms.py +++ b/vote/forms.py @@ -17,7 +17,7 @@ class AccessCodeAuthenticationForm(forms.Form): access_code = forms.CharField(label='access code') - def __init__(self, request=None, *args, **kwargs): + def __init__(self, *args, request=None, **kwargs): """ The 'request' parameter is set for custom auth use by subclasses. The form data comes in via the standard 'data' kwarg. @@ -98,7 +98,7 @@ class VoteForm(forms.Form): votes_yes = 0 - for application_pk, vote in self.cleaned_data.items(): + for _, vote in self.cleaned_data.items(): if vote == VOTE_ACCEPT: votes_yes += 1 diff --git a/vote/urls.py b/vote/urls.py index 90303e7f4f6d91452af80fce6a24da8c39ba2c71..a2d6a682377c37a4cf595d6d4c9433280514289a 100644 --- a/vote/urls.py +++ b/vote/urls.py @@ -19,5 +19,5 @@ urlpatterns = [ ), name='logout'), path('vote/<int:election_id>/apply', views.apply, name='apply'), path('vote/<int:election_id>/delete-own-application', views.delete_own_application, name='delete_own_application'), - path('help', views.help, name='help'), + path('help', views.help_page, name='help'), ] diff --git a/vote/views.py b/vote/views.py index 7cce4ee351964129fd7a71a5a401c1487f814a90..1c3152d0d916a795b0a9c36871564736eb31506f 100644 --- a/vote/views.py +++ b/vote/views.py @@ -151,5 +151,5 @@ def delete_own_application(request, election_id): return HttpResponseNotFound('Application does not exist') -def help(request): +def help_page(request): return render(request, template_name='vote/help.html')