diff --git a/src/postorius/forms.py b/src/postorius/forms.py index e8501bc..536194a 100644 --- a/src/postorius/forms.py +++ b/src/postorius/forms.py @@ -20,7 +20,6 @@ from django.core.validators import validate_email, URLValidator from django.utils.translation import gettext_lazy as _ from fieldset_forms import FieldsetForm -from django.forms.models import modelformset_factory class DomainNew(FieldsetForm): @@ -927,5 +926,6 @@ email = cleaned_data.get('email') user_email = cleaned_data.get('user_email') if email == user_email: - raise forms.ValidationError(_('Please provide a different email address than your own.')) + raise forms.ValidationError(_('Please provide a different email ' + 'address than your own.')) return cleaned_data diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index ee6e038..f001c79 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -17,7 +17,6 @@ # Postorius. If not, see . import logging -from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import (login_required, user_passes_test) @@ -31,8 +30,7 @@ from urllib2 import HTTPError from postorius import utils -from postorius.models import (Domain, List, MailmanUser, - MailmanApiError) +from postorius.models import (Domain, List, MailmanApiError) from postorius.forms import * from postorius.auth.decorators import * from postorius.views.generic import MailingListView @@ -234,7 +232,6 @@ class ListMassSubscribeView(MailingListView): - """Mass subscription.""" @method_decorator(list_owner_required) @@ -254,9 +251,10 @@ try: validate_email(email) self.mailing_list.subscribe(address=email) - messages.success(request, - 'The address %s has been subscribed to %s.' % - (email, self.mailing_list.fqdn_listname)) + messages.success( + request, + 'The address %s has been subscribed to %s.' % + (email, self.mailing_list.fqdn_listname)) except MailmanApiError: return utils.render_api_error(request) except HTTPError, e: @@ -267,6 +265,7 @@ email) return redirect('mass_subscribe', self.mailing_list.list_id) + def _get_choosable_domains(request): try: domains = Domain.objects.all() @@ -473,7 +472,6 @@ context_instance=RequestContext(request)) - @list_moderator_required def list_held_messages(request, list_id): """Shows a list of held messages. @@ -686,11 +684,11 @@ if len(to_activate) > 0: messages.success(request, _('You activated new archivers for this list: ' - '{0}'.format(', '.join(to_activate)))) + '{0}'.format(', '.join(to_activate)))) if len(to_disable) > 0: messages.success(request, _('You disabled the following archivers: ' - '{0}'.format(', '.join(to_disable)))) + '{0}'.format(', '.join(to_disable)))) enabled = [key for key in archivers.keys() if archivers[key] is True] initial = {'archivers': enabled} form = ListArchiverForm(initial=initial, archivers=archivers)