%s
@@ -363,52 +406,58 @@ def render(self, *args, **kwargs):
class="remove_answer">X
- """ % html
+ """
+ % html
+ )
return mark_safe(html)
DEFAULT_ANSWERS_COUNT = 2
-MAX_QUESTIONS_LIMIT = getattr(settings, 'MAX_QUESTIONS_LIMIT', 1)
+MAX_QUESTIONS_LIMIT = getattr(settings, "MAX_QUESTIONS_LIMIT", 1)
class QuestionBaseForm(forms.Form):
- choice_type = forms.ChoiceField(choices=(
- ('choice', _('Choice')),
- ))
- question = forms.CharField(label=_("Question"), max_length=5000,
- required=True,
- widget=forms.Textarea(attrs={
- 'rows': 4,
- 'class': 'textarea'
- }))
+ choice_type = forms.ChoiceField(choices=(("choice", _("Choice")),))
+ question = forms.CharField(
+ label=_("Question"),
+ max_length=5000,
+ required=True,
+ widget=forms.Textarea(attrs={"rows": 4, "class": "textarea"}),
+ )
def __init__(self, *args, **kwargs):
super(QuestionBaseForm, self).__init__(*args, **kwargs)
- if len(self.fields['choice_type'].choices) == 1:
- self.fields['choice_type'].widget = forms.HiddenInput()
- self.fields['choice_type'].initial = 'choice'
+ if len(self.fields["choice_type"].choices) == 1:
+ self.fields["choice_type"].widget = forms.HiddenInput()
+ self.fields["choice_type"].initial = "choice"
- answers = len(filter(lambda k: k.startswith("%s-answer_" %
- self.prefix), self.data))
+ answers = len(
+ [k for k in self.data if k.startswith("%s-answer_" % self.prefix)]
+ )
if not answers:
- answers = len(filter(lambda k: k.startswith("answer_") and not "indexes" in k,
- self.initial.keys()))
+ answers = len(
+ [
+ k
+ for k in list(self.initial.keys())
+ if k.startswith("answer_") and not "indexes" in k
+ ]
+ )
if answers == 0:
answers = DEFAULT_ANSWERS_COUNT
for ans in range(answers):
- field_key = 'answer_%d' % ans
- self.fields[field_key] = forms.CharField(max_length=300,
- required=True,
- widget=AnswerWidget)
- self.fields[field_key].widget.attrs = {'class': 'answer_input'}
+ field_key = "answer_%d" % ans
+ self.fields[field_key] = forms.CharField(
+ max_length=300, required=True, widget=AnswerWidget
+ )
+ self.fields[field_key].widget.attrs = {"class": "answer_input"}
self._answers = answers
def clean_question(self):
- q = self.cleaned_data.get('question', '')
- if '%' in q:
+ q = self.cleaned_data.get("question", "")
+ if "%" in q:
raise forms.ValidationError(INVALID_CHAR_MSG % "%")
return q.replace(": ", ":\t")
@@ -423,25 +472,24 @@ class QuestionForm(QuestionBaseForm):
def __init__(self, *args, **kwargs):
super(QuestionForm, self).__init__(*args, **kwargs)
answers = self._answers
- max_choices = map(lambda x: (x,x), range(1, self.max_limit or answers+1))
- min_choices = map(lambda x: (x,x), range(0, answers+1 if self.min_limit is None else self.min_limit))
-
- self.fields['max_answers'].choices = max_choices
- self.fields['max_answers'].initial = min(map(lambda x:x[1], max_choices))
- self.fields['min_answers'].choices = max_choices
- self.fields['min_answers'].initial = 0
-
+ max_choices = [(x, x) for x in range(1, self.max_limit or answers + 1)]
+
+ self.fields["max_answers"].choices = max_choices
+ self.fields["max_answers"].initial = min([x[1] for x in max_choices])
+ self.fields["min_answers"].choices = max_choices
+ self.fields["min_answers"].initial = 0
def clean(self):
- max_answers = int(self.cleaned_data.get('max_answers'))
- min_answers = int(self.cleaned_data.get('min_answers'))
+ max_answers = int(self.cleaned_data.get("max_answers"))
+ min_answers = int(self.cleaned_data.get("min_answers"))
if min_answers > max_answers:
- raise forms.ValidationError(_("Max answers should be greater "
- "or equal to min answers"))
+ raise forms.ValidationError(
+ _("Max answers should be greater " "or equal to min answers")
+ )
answer_list = []
for key in self.cleaned_data:
- if key.startswith('answer_'):
- if '%' in self.cleaned_data[key]:
+ if key.startswith("answer_"):
+ if "%" in self.cleaned_data[key]:
raise forms.ValidationError(INVALID_CHAR_MSG % "%")
answer_list.append(self.cleaned_data[key])
if len(answer_list) > len(set(answer_list)):
@@ -450,24 +498,31 @@ def clean(self):
class PartyForm(QuestionForm):
- question = forms.CharField(label=_("Party name"), max_length=255,
- required=True, widget=forms.Textarea(attrs={
- 'rows': 4,
- 'class': 'textarea'
- }))
+ question = forms.CharField(
+ label=_("Party name"),
+ max_length=255,
+ required=True,
+ widget=forms.Textarea(attrs={"rows": 4, "class": "textarea"}),
+ )
+
SCORES_DEFAULT_LEN = 2
-SCORES_CHOICES = [(x,x) for x in range(1, 10)]
+SCORES_CHOICES = [(x, x) for x in range(1, 10)]
+
+
class ScoresForm(QuestionBaseForm):
- scores = forms.MultipleChoiceField(required=True,
- widget=forms.CheckboxSelectMultiple,
- choices=SCORES_CHOICES,
- label=_('Scores'))
+ scores = forms.MultipleChoiceField(
+ required=True,
+ widget=forms.CheckboxSelectMultiple,
+ choices=SCORES_CHOICES,
+ label=_("Scores"),
+ )
scores.initial = (1, 2)
min_answers = forms.ChoiceField(label=_("Min answers"), required=True)
max_answers = forms.ChoiceField(label=_("Max answers"), required=True)
+
def __init__(self, *args, **kwargs):
super(ScoresForm, self).__init__(*args, **kwargs)
if type(self.data) != dict:
@@ -475,35 +530,35 @@ def __init__(self, *args, **kwargs):
else:
myDict = self.data
- if 'form-0-scores' in myDict:
- self._scores_len = len(myDict['form-0-scores'])
- elif 'scores' in self.initial:
- self._scores_len = len(self.initial['scores'])
+ if "form-0-scores" in myDict:
+ self._scores_len = len(myDict["form-0-scores"])
+ elif "scores" in self.initial:
+ self._scores_len = len(self.initial["scores"])
else:
self._scores_len = SCORES_DEFAULT_LEN
- max_choices = map(lambda x: (x,x), range(1, self._scores_len + 1))
- self.fields['max_answers'].choices = max_choices
- self.fields['max_answers'].initial = self._scores_len
- self.fields['min_answers'].choices = max_choices
-
+ max_choices = [(x, x) for x in range(1, self._scores_len + 1)]
+ self.fields["max_answers"].choices = max_choices
+ self.fields["max_answers"].initial = self._scores_len
+ self.fields["min_answers"].choices = max_choices
def clean(self):
super(ScoresForm, self).clean()
- max_answers = int(self.cleaned_data.get('max_answers', 0))
- min_answers = int(self.cleaned_data.get('min_answers', 0))
+ max_answers = int(self.cleaned_data.get("max_answers", 0))
+ min_answers = int(self.cleaned_data.get("min_answers", 0))
if (min_answers and max_answers) and min_answers > max_answers:
- raise forms.ValidationError(_("Max answers should be greater "
- "or equal to min answers"))
+ raise forms.ValidationError(
+ _("Max answers should be greater " "or equal to min answers")
+ )
answer_list = []
for key in self.cleaned_data:
- if key.startswith('answer_'):
- if '%' in self.cleaned_data[key]:
+ if key.startswith("answer_"):
+ if "%" in self.cleaned_data[key]:
raise forms.ValidationError(INVALID_CHAR_MSG % "%")
answer_list.append(self.cleaned_data[key])
if len(answer_list) > len(set(answer_list)):
raise forms.ValidationError(_("No duplicate choices allowed"))
- if 'scores' in self.cleaned_data:
- if (len(answer_list) < max_answers):
+ if "scores" in self.cleaned_data:
+ if len(answer_list) < max_answers:
m = _("Number of answers must be equal or bigger than max answers")
raise forms.ValidationError(m)
return self.cleaned_data
@@ -512,18 +567,18 @@ def clean(self):
class RequiredFormset(BaseFormSet):
def __init__(self, *args, **kwargs):
- super(RequiredFormset, self).__init__(*args, **kwargs)
- try:
- self.forms[0].empty_permitted = False
- except IndexError:
- pass
+ super(RequiredFormset, self).__init__(*args, **kwargs)
+ try:
+ self.forms[0].empty_permitted = False
+ except IndexError:
+ pass
+
class CandidateWidget(MultiWidget):
def __init__(self, *args, **kwargs):
- departments = kwargs.pop('departments', [])
- widgets = (TextInput(),
- Select(choices=departments))
+ departments = kwargs.pop("departments", [])
+ widgets = (TextInput(), Select(choices=departments))
super(CandidateWidget, self).__init__(widgets, *args, **kwargs)
def decompress(self, value):
@@ -547,12 +602,16 @@ def format_output(self, rendered_widgets):
class="remove_answer">X
- """ % (rendered_widgets[0], rendered_widgets[1])
+ """ % (
+ rendered_widgets[0],
+ rendered_widgets[1],
+ )
def value_from_datadict(self, data, files, name):
datalist = [
- widget.value_from_datadict(data, files, name + '_%s' % i)
- for i, widget in enumerate(self.widgets)]
+ widget.value_from_datadict(data, files, name + "_%s" % i)
+ for i, widget in enumerate(self.widgets)
+ ]
return json.dumps(datalist)
@@ -561,75 +620,81 @@ class StvForm(QuestionBaseForm):
answer_widget_values_len = 2
def __init__(self, *args, **kwargs):
- deps = kwargs['initial'].get('departments_data', '').split('\n')
+ deps = kwargs["initial"].get("departments_data", "").split("\n")
DEPARTMENT_CHOICES = []
for dep in deps:
- DEPARTMENT_CHOICES.append((dep.strip(),dep.strip()))
+ DEPARTMENT_CHOICES.append((dep.strip(), dep.strip()))
super(StvForm, self).__init__(*args, **kwargs)
- self.fields.pop('question')
- answers = len(
- filter(
- lambda k: k.startswith("%s-answer_" % self.prefix),
- self.data)
- ) / self.answer_widget_values_len
+ self.fields.pop("question")
+ answers = (
+ len([k for k in self.data if k.startswith("%s-answer_" % self.prefix)])
+ / self.answer_widget_values_len
+ )
if not answers:
- answers = len(filter(lambda k: k.startswith("answer_"),
- self.initial))
+ answers = len([k for k in self.initial if k.startswith("answer_")])
if answers == 0:
answers = DEFAULT_ANSWERS_COUNT
self.fields.clear()
for ans in range(answers):
- field_key = 'answer_%d' % ans
- field_key1 = 'department_%d' % ans
+ field_key = "answer_%d" % ans
+ field_key1 = "department_%d" % ans
_widget = self._make_candidate_widget(DEPARTMENT_CHOICES)
- self.fields[field_key] = forms.CharField(max_length=600,
- required=True,
- widget=_widget,
- label=('Candidate'))
+ self.fields[field_key] = forms.CharField(
+ max_length=600, required=True, widget=_widget, label=("Candidate")
+ )
elig_help_text = _("https://en.wikipedia.org/wiki/Droop_quota")
label_text = _("Droop quota")
- ordered_dict_prepend(self.fields, 'droop_quota',
- forms.BooleanField(
- required=False,
- label=label_text,
- initial=True,
- help_text=elig_help_text))
- self.fields['droop_quota'].widget.attrs['readonly'] = True
- self.fields['droop_quota'].widget.attrs['disabled'] = True
-
- widget=forms.TextInput(attrs={'hidden': 'True'})
+ ordered_dict_prepend(
+ self.fields,
+ "droop_quota",
+ forms.BooleanField(
+ required=False, label=label_text, initial=True, help_text=elig_help_text
+ ),
+ )
+ self.fields["droop_quota"].widget.attrs["readonly"] = True
+ self.fields["droop_quota"].widget.attrs["disabled"] = True
+
+ widget = forms.TextInput(attrs={"hidden": "True"})
dep_lim_help_text = _("maximum number of elected from the same constituency")
dep_lim_label = _("Constituency limit")
- ordered_dict_prepend(self.fields, 'department_limit',
- forms.CharField(
- help_text=dep_lim_help_text,
- label=dep_lim_label,
- widget=widget,
- required=False))
-
- widget=forms.CheckboxInput()
+ ordered_dict_prepend(
+ self.fields,
+ "department_limit",
+ forms.CharField(
+ help_text=dep_lim_help_text,
+ label=dep_lim_label,
+ widget=widget,
+ required=False,
+ ),
+ )
+
+ widget = forms.CheckboxInput()
limit_help_text = _("enable limiting the elections from the same constituency")
limit_label = _("Limit elected per constituency")
- ordered_dict_prepend(self.fields, 'has_department_limit',
- forms.BooleanField(
- widget=widget,
- help_text=limit_help_text,
- label = limit_label,
- required=False))
+ ordered_dict_prepend(
+ self.fields,
+ "has_department_limit",
+ forms.BooleanField(
+ widget=widget,
+ help_text=limit_help_text,
+ label=limit_label,
+ required=False,
+ ),
+ )
elig_help_text = _("set the eligibles count of the election")
label_text = _("Eligibles count")
- ordered_dict_prepend(self.fields, 'eligibles',
- forms.CharField(
- label=label_text,
- help_text=elig_help_text))
-
+ ordered_dict_prepend(
+ self.fields,
+ "eligibles",
+ forms.CharField(label=label_text, help_text=elig_help_text),
+ )
min_answers = None
max_answers = None
@@ -639,28 +704,28 @@ def _make_candidate_widget(self, departments):
def _clean_answer(self, answer):
from django.forms.util import ErrorList
+
answer_lst = json.loads(answer)
- if '%' in answer_lst[0]:
+ if "%" in answer_lst[0]:
raise forms.ValidationError(INVALID_CHAR_MSG % "%")
if not answer_lst[0]:
message = _("This field is required.")
- self._errors['answer_0'] = ErrorList([message])
+ self._errors["answer_0"] = ErrorList([message])
return None, json.dumps([])
answer_lst[0] = answer_lst[0].strip()
return answer_lst[0], json.dumps(answer_lst)
def clean(self):
- answers = len(
- filter(
- lambda k: k.startswith(
- "%s-answer_" % self.prefix), self.data)
- ) / self.answer_widget_values_len
+ answers = (
+ len([k for k in self.data if k.startswith("%s-answer_" % self.prefix)])
+ / self.answer_widget_values_len
+ )
- #list used for checking duplicate candidates
+ # list used for checking duplicate candidates
candidates_list = []
for ans in range(answers):
- field_key = 'answer_%d' % ans
+ field_key = "answer_%d" % ans
answer = self.cleaned_data[field_key]
key, cleaned = self._clean_answer(answer)
candidates_list.append(key)
@@ -669,25 +734,25 @@ def clean(self):
if len(candidates_list) > len(set(candidates_list)):
raise forms.ValidationError(_("No duplicate choices allowed"))
- self.cleaned_data['droop_quota'] = True
+ self.cleaned_data["droop_quota"] = True
return self.cleaned_data
def clean_eligibles(self):
message = _("Value must be a positve integer")
- eligibles = self.cleaned_data.get('eligibles')
+ eligibles = self.cleaned_data.get("eligibles")
try:
eligibles = int(eligibles)
if eligibles > 0:
return eligibles
else:
raise forms.ValidationError(message)
- except ValueError,TypeError:
+ except ValueError as TypeError:
raise forms.ValidationError(message)
def clean_department_limit(self):
message = _("Value must be a positve integer")
- dep_limit = self.cleaned_data.get('department_limit')
- if self.cleaned_data.get('has_department_limit'):
+ dep_limit = self.cleaned_data.get("department_limit")
+ if self.cleaned_data.get("has_department_limit"):
if not dep_limit:
raise forms.ValidationError(message)
else:
@@ -706,23 +771,21 @@ class UniCouncilsGrForm(StvForm):
def __init__(self, *args, **kwargs):
super(UniCouncilsGrForm, self).__init__(*args, **kwargs)
- has_limit_help_text = \
- _("enable limiting the elections from the same department")
- has_limit_label = \
- _("Limit elected per department")
- self.fields['has_department_limit'].label = has_limit_label
- self.fields['has_department_limit'].help_text = has_limit_label
- dep_lim_help_text = \
- _("maximum number of elected from the same department")
- dep_lim_label = \
- _("Department limit")
- self.fields['department_limit'].label = dep_lim_label
- self.fields['department_limit'].help_text = dep_lim_help_text
- del self.fields['droop_quota']
+ has_limit_help_text = _(
+ "enable limiting the elections from the same department"
+ )
+ has_limit_label = _("Limit elected per department")
+ self.fields["has_department_limit"].label = has_limit_label
+ self.fields["has_department_limit"].help_text = has_limit_label
+ dep_lim_help_text = _("maximum number of elected from the same department")
+ dep_lim_label = _("Department limit")
+ self.fields["department_limit"].label = dep_lim_label
+ self.fields["department_limit"].help_text = dep_lim_help_text
+ del self.fields["droop_quota"]
def clean(self):
super(UniCouncilsGrForm, self).clean()
- self.cleaned_data['droop_quota'] = False
+ self.cleaned_data["droop_quota"] = False
return self.cleaned_data
@@ -732,31 +795,30 @@ class PreferencesForm(StvForm):
def __init__(self, *args, **kwargs):
super(PreferencesForm, self).__init__(*args, **kwargs)
- del self.fields['department_limit']
- del self.fields['has_department_limit']
- del self.fields['eligibles']
- del self.fields['droop_quota']
+ del self.fields["department_limit"]
+ del self.fields["has_department_limit"]
+ del self.fields["eligibles"]
+ del self.fields["droop_quota"]
def _make_candidate_widget(self, departments):
- return AnswerWidget(attrs={'class': 'answer_input'})
+ return AnswerWidget(attrs={"class": "answer_input"})
def _clean_answer(self, answer):
- if '%' in answer:
+ if "%" in answer:
raise forms.ValidationError(INVALID_CHAR_MSG % "%")
return answer, answer
class LoginForm(forms.Form):
- username = forms.CharField(label=_('Username'),
- max_length=50)
- password = forms.CharField(label=_('Password'),
- widget=forms.PasswordInput(),
- max_length=100)
+ username = forms.CharField(label=_("Username"), max_length=50)
+ password = forms.CharField(
+ label=_("Password"), widget=forms.PasswordInput(), max_length=100
+ )
def clean(self):
self._user_cache = None
- username = self.cleaned_data.get('username')
- password = self.cleaned_data.get('password')
+ username = self.cleaned_data.get("username")
+ password = self.cleaned_data.get("password")
try:
user = User.objects.get(user_id=username)
except User.DoesNotExist:
@@ -765,7 +827,7 @@ def clean(self):
if user.is_disabled:
raise forms.ValidationError(_("Your account is disabled"))
- if check_password(password, user.info['password']):
+ if check_password(password, user.info["password"]):
self._user_cache = user
return self.cleaned_data
else:
@@ -775,143 +837,152 @@ def clean(self):
class PollForm(forms.ModelForm):
FIELD_REQUIRED_FEATURES = {
- 'name': ['edit_name'],
- 'forum_enabled': ['edit_forum'],
- 'forum_ends_at': ['edit_forum'],
- 'forum_description': ['edit_forum'],
- 'forum_starts_at': ['edit_forum'],
- 'forum_extended_until': ['edit_forum_extension'],
- 'linked_ref': ['edit_linked_ref'],
- 'taxisnet_auth': ['edit_taxisnet']
+ "name": ["edit_name"],
+ "forum_enabled": ["edit_forum"],
+ "forum_ends_at": ["edit_forum"],
+ "forum_description": ["edit_forum"],
+ "forum_starts_at": ["edit_forum"],
+ "forum_extended_until": ["edit_forum_extension"],
+ "linked_ref": ["edit_linked_ref"],
+ "taxisnet_auth": ["edit_taxisnet"],
}
formfield_callback = election_form_formfield_cb
- forum_enabled = forms.BooleanField(label=_('Poll forum enabled'),
- required=False,
- help_text=help.forum_enabled)
- linked_ref = forms.ChoiceField(required=False, initial='',
- label=_('Link voters list to another poll'))
+ forum_enabled = forms.BooleanField(
+ label=_("Poll forum enabled"), required=False, help_text=help.forum_enabled
+ )
+ linked_ref = forms.ChoiceField(
+ required=False, initial="", label=_("Link voters list to another poll")
+ )
def __init__(self, *args, **kwargs):
- self.election = kwargs.pop('election', None)
- self.admin = kwargs.pop('admin', None)
+ self.election = kwargs.pop("election", None)
+ self.admin = kwargs.pop("admin", None)
super(PollForm, self).__init__(*args, **kwargs)
- if 'linked_ref' in self.initial and self.initial['linked_ref'] is None:
- self.initial['linked_ref'] = ''
+ if "linked_ref" in self.initial and self.initial["linked_ref"] is None:
+ self.initial["linked_ref"] = ""
CHOICES = (
- ('public', 'public'),
- ('confidential', 'confidential'),
- )
-
- TYPES = (
- ('google', 'google'),
- ('facebook', 'facfebook'),
- ('other', 'other')
+ ("public", "public"),
+ ("confidential", "confidential"),
)
+ TYPES = (("google", "google"), ("facebook", "facfebook"), ("other", "other"))
- ordered_dict_prepend(self.fields, 'jwt_file',
- forms.FileField(
- label="JWT public keyfile",
- required=False))
+ ordered_dict_prepend(
+ self.fields,
+ "jwt_file",
+ forms.FileField(label="JWT public keyfile", required=False),
+ )
if self.instance.is_linked_root:
- del self.fields['linked_ref']
+ del self.fields["linked_ref"]
else:
linked_choices = [["", ""]]
for p in self.election.polls.filter().exclude(pk=self.instance.pk):
if not p.is_linked_leaf:
linked_choices.append((p.uuid, p.name))
- self.fields['linked_ref'].choices = linked_choices
-
- self.fields['jwt_file'].widget.attrs['accept'] = '.pem'
- self.fields['jwt_public_key'] = forms.CharField(required=False,
- widget=forms.Textarea)
- self.fields['oauth2_type'] = forms.ChoiceField(required=False,
- choices=TYPES)
- self.fields['oauth2_client_type'] = forms.ChoiceField(required=False,
- choices=CHOICES)
- self.fields['google_code_url'] = forms.CharField(
- widget=HiddenInput,
- initial="https://accounts.google.com/o/oauth2/auth",
- required=False)
- self.fields['google_exchange_url'] = forms.CharField(
- widget=HiddenInput,
- initial="https://accounts.google.com/o/oauth2/token",
- required=False)
- self.fields['google_confirmation_url'] = forms.CharField(
- widget=HiddenInput,
- initial="https://www.googleapis.com/oauth2/v1/userinfo",
- required=False)
- self.fields['facebook_code_url'] = forms.CharField(
- widget=HiddenInput,
- initial="https://www.facebook.com/dialog/oauth",
- required=False)
- self.fields['facebook_exchange_url'] = forms.CharField(
- widget=HiddenInput,
- initial="https://graph.facebook.com/oauth/access_token",
- required=False)
- self.fields['facebook_confirmation_url'] = forms.CharField(
- widget=HiddenInput,
- initial="https://graph.facebook.com/v2.2/me",
- required=False)
-
- self.fields['forum_starts_at'].help_text = None
- self.fields['forum_ends_at'].help_text = _("Voting starts at %s") % self.election.voting_ends_at
+ self.fields["linked_ref"].choices = linked_choices
+
+ self.fields["jwt_file"].widget.attrs["accept"] = ".pem"
+ self.fields["jwt_public_key"] = forms.CharField(
+ required=False, widget=forms.Textarea
+ )
+ self.fields["oauth2_type"] = forms.ChoiceField(required=False, choices=TYPES)
+ self.fields["oauth2_client_type"] = forms.ChoiceField(
+ required=False, choices=CHOICES
+ )
+ self.fields["google_code_url"] = forms.CharField(
+ widget=HiddenInput,
+ initial="https://accounts.google.com/o/oauth2/auth",
+ required=False,
+ )
+ self.fields["google_exchange_url"] = forms.CharField(
+ widget=HiddenInput,
+ initial="https://accounts.google.com/o/oauth2/token",
+ required=False,
+ )
+ self.fields["google_confirmation_url"] = forms.CharField(
+ widget=HiddenInput,
+ initial="https://www.googleapis.com/oauth2/v1/userinfo",
+ required=False,
+ )
+ self.fields["facebook_code_url"] = forms.CharField(
+ widget=HiddenInput,
+ initial="https://www.facebook.com/dialog/oauth",
+ required=False,
+ )
+ self.fields["facebook_exchange_url"] = forms.CharField(
+ widget=HiddenInput,
+ initial="https://graph.facebook.com/oauth/access_token",
+ required=False,
+ )
+ self.fields["facebook_confirmation_url"] = forms.CharField(
+ widget=HiddenInput,
+ initial="https://graph.facebook.com/v2.2/me",
+ required=False,
+ )
+ self.fields["forum_starts_at"].help_text = None
+ self.fields["forum_ends_at"].help_text = (
+ _("Voting starts at %s") % self.election.voting_ends_at
+ )
shib_data = None
if self.initial is not None:
- shib_data = self.initial.get('shibboleth_constraints', None)
- if isinstance(shib_data, basestring):
+ shib_data = self.initial.get("shibboleth_constraints", None)
+ if isinstance(shib_data, str):
shib_data = json.loads(shib)
if shib_data is not None and isinstance(shib_data, dict):
- self.initial['shibboleth_constraints'] = json.dumps(shib_data)
+ self.initial["shibboleth_constraints"] = json.dumps(shib_data)
if not self.instance or not self.instance.pk:
- self.initial['forum_ends_at'] = self.election.voting_starts_at
- self.initial['forum_starts_at'] = self.initial['forum_ends_at'] - timedelta(days=2)
+ self.initial["forum_ends_at"] = self.election.voting_starts_at
+ self.initial["forum_starts_at"] = self.initial[
+ "forum_ends_at"
+ ] - timedelta(days=2)
if self.election.feature_frozen:
- self.fields['name'].widget.attrs['readonly'] = True
+ self.fields["name"].widget.attrs["readonly"] = True
- auth_title = _('2-factor authentication')
- auth_help = _('2-factor authentication help text')
- self.fieldsets = {'auth': [auth_title, auth_help, []]}
+ auth_title = _("2-factor authentication")
+ auth_help = _("2-factor authentication help text")
+ self.fieldsets = {"auth": [auth_title, auth_help, []]}
self.fieldset_fields = []
- profiles = getattr(settings, 'ZEUS_SHIBBOLETH_PROFILES', {})
+ profiles = getattr(settings, "ZEUS_SHIBBOLETH_PROFILES", {})
self.shib_profiles = profiles
extra_auth_fields = {}
- auth_fields = ['jwt', 'google', 'facebook', 'shibboleth', 'oauth2']
- auth_checks = ['jwt_auth', 'oauth2_thirdparty', 'shibboleth_auth']
+ auth_fields = ["jwt", "google", "facebook", "shibboleth", "oauth2"]
+ auth_checks = ["jwt_auth", "oauth2_thirdparty", "shibboleth_auth"]
if taxisnet.is_enabled(self.admin) or self.instance.taxisnet_auth:
- auth_fields.append('taxisnet')
- auth_checks.append('taxisnet_auth')
+ auth_fields.append("taxisnet")
+ auth_checks.append("taxisnet_auth")
else:
- del self.fields['taxisnet_auth']
+ del self.fields["taxisnet_auth"]
if profiles:
- for key, data in profiles.items():
- field_key = 'shibprofile{}'.format(key)
- fields_key = '{}_auth'.format(field_key)
- if shib_data and shib_data.get('profile', None) == key:
- del self.initial['shibboleth_constraints']
- del self.initial['shibboleth_auth']
+ for key, data in list(profiles.items()):
+ field_key = "shibprofile{}".format(key)
+ fields_key = "{}_auth".format(field_key)
+ if shib_data and shib_data.get("profile", None) == key:
+ del self.initial["shibboleth_constraints"]
+ del self.initial["shibboleth_auth"]
self.initial[fields_key] = True
widget = forms.CheckboxInput()
- field = forms.BooleanField(widget=widget,
- help_text=data.get('help_text', ' '),
- label = data.get('label', ''),
- required=False)
+ field = forms.BooleanField(
+ widget=widget,
+ help_text=data.get("help_text", " "),
+ label=data.get("label", ""),
+ required=False,
+ )
self.fields[fields_key] = field
self.fieldset_fields.append(field)
auth_checks.append(fields_key)
auth_fields.append(field_key)
- for name, field in self.fields.items():
+ for name, field in list(self.fields.items()):
parts = name.split("_")
if not parts[0] in auth_fields:
continue
@@ -919,68 +990,82 @@ def __init__(self, *args, **kwargs):
key = parts[0]
if key in auth_fields:
- self.fieldsets['auth'][2].append(name)
+ self.fieldsets["auth"][2].append(name)
self.fieldset_fields.append(field)
- setattr(field, 'field_attrs', '')
+ setattr(field, "field_attrs", "")
attrs = "data-auth={}".format(key)
if is_check:
attrs += " data-auth-toggle=true"
- field.widget.attrs['field_class'] = 'fieldset-auth'
- field.help_text = field.help_text or ' '
+ field.widget.attrs["field_class"] = "fieldset-auth"
+ field.help_text = field.help_text or " "
else:
attrs += " data-auth-option={}".format(key)
- field.widget.attrs['field_class'] = \
- 'auth-option-field {}'.format(key)
+ field.widget.attrs["field_class"] = "auth-option-field {}".format(
+ key
+ )
field.field_attrs = attrs
- keyOrder = self.fieldsets['auth'][2]
- fieldsKeys = self.fields.keys()
+ keyOrder = self.fieldsets["auth"][2]
+ fieldsKeys = list(self.fields.keys())
for field in auth_checks:
prev_index = keyOrder.index(field)
item = keyOrder.pop(prev_index)
keyOrder.insert(0, item)
- if field == 'jwt_auth':
- self.fields[field].widget.attrs['field_class'] = 'clearfix last'
+ if field == "jwt_auth":
+ self.fields[field].widget.attrs["field_class"] = "clearfix last"
if self.admin and not self.admin.can_enable_forum:
if not self.instance.forum_enabled:
- del self.fields['forum_enabled']
+ del self.fields["forum_enabled"]
self.instance.election = self.election
setup_editable_fields(self)
disable_auth = False
for f in auth_checks:
field = self.fields[f]
- if getattr(field, 'disabled', False):
+ if getattr(field, "disabled", False):
disable_auth = True
if disable_auth:
for f in auth_checks:
field = self.fields[f]
- if not getattr(field, 'disabled', False):
+ if not getattr(field, "disabled", False):
disable_field(field, f, self, {})
-
class Meta:
model = Poll
- fields = ('name',
- 'jwt_auth', 'jwt_issuer', 'jwt_public_key',
- 'oauth2_thirdparty', 'oauth2_type',
- 'oauth2_client_type', 'oauth2_client_id',
- 'oauth2_client_secret', 'oauth2_code_url',
- 'oauth2_exchange_url', 'oauth2_confirmation_url',
- 'shibboleth_auth', 'shibboleth_constraints',
- 'forum_enabled', 'forum_description', 'forum_starts_at',
- 'forum_ends_at', 'forum_extended_until', 'linked_ref', 'taxisnet_auth')
+ fields = (
+ "name",
+ "jwt_auth",
+ "jwt_issuer",
+ "jwt_public_key",
+ "oauth2_thirdparty",
+ "oauth2_type",
+ "oauth2_client_type",
+ "oauth2_client_id",
+ "oauth2_client_secret",
+ "oauth2_code_url",
+ "oauth2_exchange_url",
+ "oauth2_confirmation_url",
+ "shibboleth_auth",
+ "shibboleth_constraints",
+ "forum_enabled",
+ "forum_description",
+ "forum_starts_at",
+ "forum_ends_at",
+ "forum_extended_until",
+ "linked_ref",
+ "taxisnet_auth",
+ )
def iter_fieldset(self, name):
for field in self.fieldsets[name][2]:
yield self[field]
def clean_linked_ref(self):
- ref = self.cleaned_data.get('linked_ref', None)
+ ref = self.cleaned_data.get("linked_ref", None)
if not ref:
ref = None
if ref:
- if not ref in self.election.polls.filter().values_list('uuid', flat=True):
+ if not ref in self.election.polls.filter().values_list("uuid", flat=True):
raise forms.ValidationError(_("Invalid poll"))
else:
p = self.election.polls.get(uuid=ref)
@@ -991,8 +1076,8 @@ def clean_linked_ref(self):
def clean_forum_starts_at(self):
# forum start date should be set on a date after current date.
- enabled = self.cleaned_data.get('forum_enabled')
- starts_at = self.cleaned_data.get('forum_starts_at')
+ enabled = self.cleaned_data.get("forum_enabled")
+ starts_at = self.cleaned_data.get("forum_starts_at")
if enabled and not starts_at:
raise forms.ValidationError(_("This field is required."))
voting_starts = self.election.voting_starts_at
@@ -1003,9 +1088,9 @@ def clean_forum_starts_at(self):
def clean_forum_ends_at(self):
# forum end date should be set if forum is enabled and should be set to
# a date after current date and after forum start date
- enabled = self.cleaned_data.get('forum_enabled')
- starts_at = self.cleaned_data.get('forum_starts_at')
- ends_at = self.cleaned_data.get('forum_ends_at')
+ enabled = self.cleaned_data.get("forum_enabled")
+ starts_at = self.cleaned_data.get("forum_starts_at")
+ ends_at = self.cleaned_data.get("forum_ends_at")
voting_starts = self.election.voting_starts_at
if enabled and not ends_at:
raise forms.ValidationError(_("This field is required."))
@@ -1017,8 +1102,8 @@ def clean_forum_ends_at(self):
return ends_at
def clean_forum_description(self):
- desc = self.cleaned_data.get('forum_description') or ''
- enabled = self.cleaned_data.get('forum_enabled')
+ desc = self.cleaned_data.get("forum_description") or ""
+ enabled = self.cleaned_data.get("forum_enabled")
desc = desc.strip()
if enabled and not desc:
@@ -1026,8 +1111,8 @@ def clean_forum_description(self):
return desc
def clean_forum_extended_until(self):
- date = self.cleaned_data.get('forum_extended_until')
- enabled = self.cleaned_data.get('forum_enabled')
+ date = self.cleaned_data.get("forum_extended_until")
+ enabled = self.cleaned_data.get("forum_enabled")
forum_ends_at = self.instance.forum_ends_at
if enabled and date and (date <= forum_ends_at):
@@ -1035,12 +1120,12 @@ def clean_forum_extended_until(self):
return date
def clean_shibboleth_constraints(self):
- value = self.cleaned_data.get('shibboleth_constraints', None)
+ value = self.cleaned_data.get("shibboleth_constraints", None)
if value == "None":
return None
try:
value and json.loads(value)
- except Exception, e:
+ except Exception as e:
raise forms.ValidationError(_("Invalid shibboleth constraints."))
return value
@@ -1051,70 +1136,84 @@ def clean(self):
data = self.cleaned_data
election_polls = self.election.polls.all()
- enabled = self.cleaned_data.get('forum_enabled')
- linked_ref = self.cleaned_data.get('linked_ref')
+ enabled = self.cleaned_data.get("forum_enabled")
+ linked_ref = self.cleaned_data.get("linked_ref")
if enabled and linked_ref:
msg = [_("Forum cannot be enabled for linked polls")]
self._errors["forum_enabled"] = msg
self._errors["linked_ref"] = msg
for poll in election_polls:
- if (data.get('name') == poll.name and
- ((not self.instance.pk ) or
- (self.instance.pk and self.instance.name!=data.get('name')))):
+ if data.get("name") == poll.name and (
+ (not self.instance.pk)
+ or (self.instance.pk and self.instance.name != data.get("name"))
+ ):
message = _("Duplicate poll names are not allowed")
raise forms.ValidationError(message)
- if self.election.feature_frozen and\
- (self.cleaned_data['name'] != self.instance.name):
- raise forms.ValidationError(_("Poll name cannot be changed\
- after freeze"))
-
- oauth2_field_names = ['type', 'client_type', 'client_id', 'client_secret',
- 'code_url', 'exchange_url', 'confirmation_url']
- oauth2_field_names = ['oauth2_' + x for x in oauth2_field_names]
- jwt_field_names = ['jwt_issuer', 'jwt_public_key']
+ if self.election.feature_frozen and (
+ self.cleaned_data["name"] != self.instance.name
+ ):
+ raise forms.ValidationError(
+ _(
+ "Poll name cannot be changed\
+ after freeze"
+ )
+ )
+
+ oauth2_field_names = [
+ "type",
+ "client_type",
+ "client_id",
+ "client_secret",
+ "code_url",
+ "exchange_url",
+ "confirmation_url",
+ ]
+ oauth2_field_names = ["oauth2_" + x for x in oauth2_field_names]
+ jwt_field_names = ["jwt_issuer", "jwt_public_key"]
url_validate = URLValidator()
- if data['oauth2_thirdparty']:
+ if data["oauth2_thirdparty"]:
for field_name in oauth2_field_names:
if not data[field_name]:
- self._errors[field_name] = _('This field is required.'),
- url_types = ['code', 'exchange', 'confirmation']
+ self._errors[field_name] = (_("This field is required."),)
+ url_types = ["code", "exchange", "confirmation"]
for url_type in url_types:
try:
- url_validate(data['oauth2_{}_url'.format(url_type)])
+ url_validate(data["oauth2_{}_url".format(url_type)])
except ValidationError:
- self._errors['oauth2_{}_url'.format(url_type)] =\
- ((_("This URL is invalid"),))
+ self._errors["oauth2_{}_url".format(url_type)] = (
+ _("This URL is invalid"),
+ )
else:
for field_name in oauth2_field_names:
- data[field_name] = ''
+ data[field_name] = ""
shibboleth_field_names = []
- if data['shibboleth_auth']:
+ if data["shibboleth_auth"]:
for field_name in shibboleth_field_names:
if not data[field_name]:
- self._errors[field_name] = _('This field is required.'),
+ self._errors[field_name] = (_("This field is required."),)
- for _key, item in self.shib_profiles.items():
- key = 'shibprofile{}_auth'.format(_key)
+ for _key, item in list(self.shib_profiles.items()):
+ key = "shibprofile{}_auth".format(_key)
if data[key]:
- data['shibboleth_auth'] = True
- data['shibboleth_constraints'] = item.get('data')
- data['shibboleth_constraints']['profile'] = _key
+ data["shibboleth_auth"] = True
+ data["shibboleth_constraints"] = item.get("data")
+ data["shibboleth_constraints"]["profile"] = _key
- if data['jwt_auth']:
+ if data["jwt_auth"]:
for field_name in jwt_field_names:
if not data[field_name]:
- self._errors[field_name] = _('This field is required.'),
+ self._errors[field_name] = (_("This field is required."),)
else:
for field_name in jwt_field_names:
- data[field_name] = ''
+ data[field_name] = ""
return data
def save(self, *args, **kwargs):
- was_linked = self.initial.get('linked_ref', None)
- commit = kwargs.pop('commit', True)
+ was_linked = self.initial.get("linked_ref", None)
+ commit = kwargs.pop("commit", True)
instance = super(PollForm, self).save(commit=False, *args, **kwargs)
instance.election = self.election
is_new = instance.pk is None
@@ -1129,21 +1228,21 @@ def save(self, *args, **kwargs):
class PollFormSet(BaseModelFormSet):
def __init__(self, *args, **kwargs):
- self.election = kwargs.pop('election', None)
- self.admin = kwargs.pop('admin', None)
+ self.election = kwargs.pop("election", None)
+ self.admin = kwargs.pop("admin", None)
super(PollFormSet, self).__init__(*args, **kwargs)
def _construct_form(self, i, **kwargs):
- kwargs['election'] = kwargs.get('election', self.election)
- kwargs['admin'] = kwargs.get('admin', self.admin)
+ kwargs["election"] = kwargs.get("election", self.election)
+ kwargs["admin"] = kwargs.get("admin", self.admin)
return super(PollFormSet, self)._construct_form(i, **kwargs)
def clean(self):
forms_data = self.cleaned_data
form_poll_names = []
for form_data in forms_data:
- form_poll_names.append(form_data['name'])
- poll_name = form_data['name']
+ form_poll_names.append(form_data["name"])
+ poll_name = form_data["name"]
e = Election.objects.get(id=self.election.id)
election_polls = e.polls.all()
for poll in election_polls:
@@ -1155,9 +1254,8 @@ def clean(self):
raise forms.ValidationError(message)
def save(self, election, *args, **kwargs):
- commit = kwargs.pop('commit', True)
- instances = super(PollFormSet, self).save(commit=False, *args,
- **kwargs)
+ commit = kwargs.pop("commit", True)
+ instances = super(PollFormSet, self).save(commit=False, *args, **kwargs)
if commit:
for instance in instances:
instance.election = election
@@ -1167,29 +1265,43 @@ def save(self, election, *args, **kwargs):
SEND_TO_CHOICES = [
- ('all', _('all selected voters')),
- ('voted', _('selected voters who have cast a ballot')),
- ('not-voted', _('selected voters who have not yet cast a ballot'))
+ ("all", _("all selected voters")),
+ ("voted", _("selected voters who have cast a ballot")),
+ ("not-voted", _("selected voters who have not yet cast a ballot")),
]
CONTACT_CHOICES = [
- ('email', _('Email only')),
- ('sms', _('SMS only')),
- ('email:sms', _('Email and SMS')),
+ ("email", _("Email only")),
+ ("sms", _("SMS only")),
+ ("email:sms", _("Email and SMS")),
]
+
class EmailVotersForm(forms.Form):
- email_subject = forms.CharField(label=_('Email subject'), max_length=80,
- required=False)
- email_body = forms.CharField(label=_('In place of BODY'), max_length=30000,
- widget=forms.Textarea, required=False)
- sms_body = forms.CharField(label=_('In place of SMS_BODY'), max_length=30000,
- widget=forms.Textarea, required=False)
- contact_method = forms.ChoiceField(label=_("Contact method"), initial="email:sms",
- choices=CONTACT_CHOICES)
- notify_once = forms.BooleanField(initial=True, label=_("Do not send sms if voter email is set"), required=False)
- send_to = forms.ChoiceField(label=_("Send To"), initial="all",
- choices=SEND_TO_CHOICES)
+ email_subject = forms.CharField(
+ label=_("Email subject"), max_length=80, required=False
+ )
+ email_body = forms.CharField(
+ label=_("In place of BODY"),
+ max_length=30000,
+ widget=forms.Textarea,
+ required=False,
+ )
+ sms_body = forms.CharField(
+ label=_("In place of SMS_BODY"),
+ max_length=30000,
+ widget=forms.Textarea,
+ required=False,
+ )
+ contact_method = forms.ChoiceField(
+ label=_("Contact method"), initial="email:sms", choices=CONTACT_CHOICES
+ )
+ notify_once = forms.BooleanField(
+ initial=True, label=_("Do not send sms if voter email is set"), required=False
+ )
+ send_to = forms.ChoiceField(
+ label=_("Send To"), initial="all", choices=SEND_TO_CHOICES
+ )
def __init__(self, election, template, *args, **kwargs):
super(EmailVotersForm, self).__init__(*args, **kwargs)
@@ -1197,31 +1309,36 @@ def __init__(self, election, template, *args, **kwargs):
self.template = template
if not election.sms_enabled:
- self.fields['sms_body'].widget = forms.HiddenInput()
- self.fields['contact_method'].widget = forms.HiddenInput()
- self.fields['contact_method'].choices = [('email', _('Email'))]
- self.fields['contact_method'].initial = 'email'
- self.fields['notify_once'].widget = forms.HiddenInput()
- self.fields['notify_once'].initial = False
+ self.fields["sms_body"].widget = forms.HiddenInput()
+ self.fields["contact_method"].widget = forms.HiddenInput()
+ self.fields["contact_method"].choices = [("email", _("Email"))]
+ self.fields["contact_method"].initial = "email"
+ self.fields["notify_once"].widget = forms.HiddenInput()
+ self.fields["notify_once"].initial = False
else:
choices = copy.copy(CONTACT_CHOICES)
choices[1] = list(choices[1])
- choices[1][1] = "%s (%s)" % (unicode(choices[1][1]), _("%d deliveries available") % election.sms_data.left)
- self.fields['contact_method'].choices = choices
+ choices[1][1] = "%s (%s)" % (
+ str(choices[1][1]),
+ _("%d deliveries available") % election.sms_data.left,
+ )
+ self.fields["contact_method"].choices = choices
def clean(self):
super(EmailVotersForm, self).clean()
data = self.cleaned_data
- if 'sms' in data.get('contact_method', []) and self.template == 'info':
- if data.get('sms_body').strip() == '':
+ if "sms" in data.get("contact_method", []) and self.template == "info":
+ if data.get("sms_body").strip() == "":
raise ValidationError(_("Please provide SMS body"))
return data
class ChangePasswordForm(forms.Form):
- password = forms.CharField(label=_('Current password'), widget=forms.PasswordInput)
- new_password = forms.CharField(label=_('New password'), widget=forms.PasswordInput)
- new_password_confirm = forms.CharField(label=_('New password confirm'), widget=forms.PasswordInput)
+ password = forms.CharField(label=_("Current password"), widget=forms.PasswordInput)
+ new_password = forms.CharField(label=_("New password"), widget=forms.PasswordInput)
+ new_password_confirm = forms.CharField(
+ label=_("New password confirm"), widget=forms.PasswordInput
+ )
def __init__(self, user, *args, **kwargs):
self.user = user
@@ -1229,24 +1346,25 @@ def __init__(self, user, *args, **kwargs):
def save(self):
user = self.user
- pwd = make_password(self.cleaned_data['new_password'].strip())
- user.info['password'] = pwd
+ pwd = make_password(self.cleaned_data["new_password"].strip())
+ user.info["password"] = pwd
user.save()
def clean(self):
cl = super(ChangePasswordForm, self).clean()
- pwd = self.cleaned_data['password'].strip()
- if not check_password(pwd, self.user.info['password']):
- raise forms.ValidationError(_('Invalid password'))
- if not self.cleaned_data.get('new_password') == \
- self.cleaned_data.get('new_password_confirm'):
- raise forms.ValidationError(_('Passwords don\'t match'))
+ pwd = self.cleaned_data["password"].strip()
+ if not check_password(pwd, self.user.info["password"]):
+ raise forms.ValidationError(_("Invalid password"))
+ if not self.cleaned_data.get("new_password") == self.cleaned_data.get(
+ "new_password_confirm"
+ ):
+ raise forms.ValidationError(_("Passwords don't match"))
return cl
class VoterLoginForm(forms.Form):
- login_id = forms.CharField(label=_('Login password'), required=True)
+ login_id = forms.CharField(label=_("Login password"), required=True)
validation = re.compile("[0-9]{1,10}-(?:[0-9]{4}-){3,}[0-9]{4}")
validation_digits = re.compile("[0-9]{17,}")
@@ -1257,17 +1375,17 @@ def __init__(self, *args, **kwargs):
def clean(self):
cleaned_data = super(VoterLoginForm, self).clean()
- login_id = self.cleaned_data.get('login_id', '').strip()
+ login_id = self.cleaned_data.get("login_id", "").strip()
invalid_login_id_error = _("Invalid login code")
if not login_id:
raise forms.ValidationError(invalid_login_id_error)
- matches = filter(bool, self.validation.findall(login_id))
+ matches = list(filter(bool, self.validation.findall(login_id)))
if len(matches):
login_id = matches[0]
else:
- matches = filter(bool, self.validation_digits.findall(login_id))
+ matches = list(filter(bool, self.validation_digits.findall(login_id)))
if len(matches):
login_id = matches[0]
@@ -1297,19 +1415,24 @@ class STVBallotForm(forms.Form):
def __init__(self, *args, **kwargs):
candidates = self.candidates
super(STVBallotForm, self).__init__(*args, **kwargs)
- choices = [('', '')]
+ choices = [("", "")]
for i, c in enumerate(candidates):
choices.append((str(i), c))
for i, c in enumerate(candidates):
- self.fields['choice_%d' % (i + 1)] = forms.ChoiceField(choices=choices, initial='', required=False, label=_("Ballot choice %s") % str(i + 1))
+ self.fields["choice_%d" % (i + 1)] = forms.ChoiceField(
+ choices=choices,
+ initial="",
+ required=False,
+ label=_("Ballot choice %s") % str(i + 1),
+ )
def get_choices(self, serial):
- vote = {'votes': [], "ballotSerialNumber": serial}
+ vote = {"votes": [], "ballotSerialNumber": serial}
for i, c in enumerate(self.candidates):
- val = self.cleaned_data.get('choice_%d' % (i + 1), '')
+ val = self.cleaned_data.get("choice_%d" % (i + 1), "")
if not val:
break
- vote['votes'].append({'rank': (i + 1), "candidateTmpId": val})
+ vote["votes"].append({"rank": (i + 1), "candidateTmpId": val})
return vote
def clean(self):
@@ -1317,7 +1440,7 @@ def clean(self):
empty = False
choices = []
for i, c in enumerate(self.candidates):
- val = self.cleaned_data.get('choice_%d' % (i + 1), '')
+ val = self.cleaned_data.get("choice_%d" % (i + 1), "")
if val == "":
empty = True
if val and empty:
@@ -1330,29 +1453,45 @@ def clean(self):
return data
-candidates_help_text = _("""Candidates list. e.g.,