diff --git a/src/postorius/context_processors.py b/src/postorius/context_processors.py
index 9dfff0f..934651f 100644
--- a/src/postorius/context_processors.py
+++ b/src/postorius/context_processors.py
@@ -49,6 +49,6 @@
'request': request,
'hyperkitty_url': hyperkitty_url,
# Resolve the login and logout URLs from the settings
- 'login_url': resolve_url(settings.LOGIN_URL),
+ 'login_url': resolve_url(settings.LOGIN_URL),
'logout_url': resolve_url(settings.LOGOUT_URL),
}
diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index 14638f4..2a1af6e 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -192,15 +192,15 @@
"""
email = forms.ChoiceField(
- label=_('Your email address'),
- validators=[validate_email],
- widget=forms.Select(),
- error_messages={
- 'required': _('Please enter an email address.'),
- 'invalid': _('Please enter a valid email address.')})
+ label=_('Your email address'),
+ validators=[validate_email],
+ widget=forms.Select(),
+ error_messages={
+ 'required': _('Please enter an email address.'),
+ 'invalid': _('Please enter a valid email address.')})
- display_name = forms.CharField(label=_('Your name (optional)'),
- required=False)
+ display_name = forms.CharField(
+ label=_('Your name (optional)'), required=False)
def __init__(self, user_emails, *args, **kwargs):
super(ListSubscribe, self).__init__(*args, **kwargs)
@@ -826,14 +826,14 @@
# Check if the address belongs to someone else
if User.objects.filter(email=email).exists():
raise forms.ValidationError(
- _('This email is in use. Please choose another or contact'
- ' the administrator'), 'error')
+ _('This email is in use. Please choose another or contact'
+ ' the administrator'), 'error')
# Check if the email is attached to a user in Mailman
try:
utils.get_client().get_user(email)
raise forms.ValidationError(
- _('This email already belongs to a user'), 'error')
+ _('This email already belongs to a user'), 'error')
except HTTPError:
pass
return email
diff --git a/src/postorius/lib/scrub.py b/src/postorius/lib/scrub.py
index f0995df..86952a6 100644
--- a/src/postorius/lib/scrub.py
+++ b/src/postorius/lib/scrub.py
@@ -170,4 +170,4 @@
if ctype == 'message/rfc822':
submsg = part.get_payload()
decodedpayload = str(submsg)
- return (counter, filebase+ext, ctype, charset, decodedpayload)
+ return (counter, filebase + ext, ctype, charset, decodedpayload)
diff --git a/src/postorius/models.py b/src/postorius/models.py
index f57403c..854dcc8 100644
--- a/src/postorius/models.py
+++ b/src/postorius/models.py
@@ -276,8 +276,8 @@
# the setting or the default
if not template_path:
template_path = getattr(
- settings, 'EMAIL_CONFIRMATION_TEMPLATE',
- 'postorius/user/address_confirmation_message.txt')
+ settings, 'EMAIL_CONFIRMATION_TEMPLATE',
+ 'postorius/user/address_confirmation_message.txt')
# Create a template context (if there is none) containing
# the activation_link and the host_url.
if not template_context:
diff --git a/src/postorius/tests/mailman_api_tests/test_address_activation.py b/src/postorius/tests/mailman_api_tests/test_address_activation.py
index 2e4ddf0..90c620a 100644
--- a/src/postorius/tests/mailman_api_tests/test_address_activation.py
+++ b/src/postorius/tests/mailman_api_tests/test_address_activation.py
@@ -38,15 +38,15 @@
super(TestAddressActivationForm, self).setUp()
# Create a user and profile.
self.user = User.objects.create_user(
- 'testuser', 'les@example.org', 'testpass')
+ 'testuser', 'les@example.org', 'testpass')
self.profile = AddressConfirmationProfile.objects.create(
- email='les2@example.org', user=self.user)
+ email='les2@example.org', user=self.user)
self.expired = AddressConfirmationProfile.objects.create(
- email='expired@example.org', user=self.user)
+ email='expired@example.org', user=self.user)
self.expired.created -= timedelta(weeks=100)
self.expired.save()
self.mm_user = self.mm_client.create_user(
- 'subscribed@example.org', 'password')
+ 'subscribed@example.org', 'password')
def test_valid_email_is_valid(self):
form = AddressActivationForm({'email': 'very_new_email@example.org'})
@@ -82,7 +82,7 @@
username=u'ler_mm', email=u'ler@mailman.mostdesirable.org',
password=u'pwd')
self.profile = AddressConfirmationProfile.objects.create(
- email=u'les@example.org', user=self.user)
+ email=u'les@example.org', user=self.user)
# Create a test request object
self.request = RequestFactory().get('/')
@@ -156,7 +156,7 @@
password='pwd')
self.mm_user = self.mm_client.create_user('ler@example.org', None)
self.profile = AddressConfirmationProfile.objects.create(
- email=u'les@example.org', user=self.user)
+ email=u'les@example.org', user=self.user)
self.profile.save()
def test_add_address(self):
diff --git a/src/postorius/tests/mailman_api_tests/test_list_bans.py b/src/postorius/tests/mailman_api_tests/test_list_bans.py
index afca78a..a071b7a 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_bans.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_bans.py
@@ -17,7 +17,7 @@
"""Tests for ban lists"""
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
@@ -59,11 +59,11 @@
self.assertEqual(response.status_code, 200)
self.assertTrue('addban_form' in response.context)
self.assertContains(
- response, '<input class="form-control" id="id_email" '
- 'name="email" type="text" />')
+ response, '<input class="form-control" id="id_email" '
+ 'name="email" type="text" />')
self.assertContains(
- response, '<button class="btn btn-primary" type="submit" '
- 'name="add">Ban email</button>')
+ response, '<button class="btn btn-primary" type="submit" '
+ 'name="add">Ban email</button>')
def test_context_contains_delete_forms(self):
banned = ['banned{}@example.com'.format(i) for i in range(1, 10)]
@@ -73,11 +73,12 @@
self.assertEqual(response.status_code, 200)
for ban in banned:
self.assertContains(
- response, '<input type="hidden" name="email" value="%s" />'
- % ban)
+ response,
+ '<input type="hidden" name="email" value="%s" />' % ban)
self.assertContains(
- response, '<button class="btn btn-danger btn-xs" '
- 'type="submit" name="del"', count=9)
+ response,
+ '<button class="btn btn-danger btn-xs" type="submit" name="del"',
+ count=9)
def test_add_ban(self):
response = self.client.post(self.url, {
diff --git a/src/postorius/tests/mailman_api_tests/test_list_header_matches.py b/src/postorius/tests/mailman_api_tests/test_list_header_matches.py
index dc708d1..f652181 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_header_matches.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_header_matches.py
@@ -17,7 +17,7 @@
"""Tests for list header matches"""
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
diff --git a/src/postorius/tests/mailman_api_tests/test_list_members.py b/src/postorius/tests/mailman_api_tests/test_list_members.py
index c57c43e..229a046 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_members.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_members.py
@@ -192,11 +192,11 @@
def test_show_members_page(self):
self.client.login(username='testsu', password='testpass')
member_1 = self.foo_list.subscribe(
- 'member-1@example.com', pre_verified=True, pre_confirmed=True,
- pre_approved=True)
+ 'member-1@example.com', pre_verified=True, pre_confirmed=True,
+ pre_approved=True)
member_2 = self.foo_list.subscribe(
- 'member-2@example.com', pre_verified=True, pre_confirmed=True,
- pre_approved=True)
+ 'member-2@example.com', pre_verified=True, pre_confirmed=True,
+ pre_approved=True)
response = self.client.get(reverse(
'list_members', args=['foo@example.com', 'subscriber']))
self.assertEqual(response.status_code, 200)
@@ -208,11 +208,11 @@
def test_search_members_1(self):
self.client.login(username='testsu', password='testpass')
member_1 = self.foo_list.subscribe(
- 'member-1@example.com', pre_verified=True, pre_confirmed=True,
- pre_approved=True)
+ 'member-1@example.com', pre_verified=True, pre_confirmed=True,
+ pre_approved=True)
member_2 = self.foo_list.subscribe(
- 'member-2@example.com', pre_verified=True, pre_confirmed=True,
- pre_approved=True)
+ 'member-2@example.com', pre_verified=True, pre_confirmed=True,
+ pre_approved=True)
response = self.client.get(reverse(
'list_members', args=['foo@example.com', 'subscriber']),
{'q': 'example.com'})
diff --git a/src/postorius/tests/mailman_api_tests/test_list_settings.py b/src/postorius/tests/mailman_api_tests/test_list_settings.py
index 4f96c72..ba10b5b 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_settings.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_settings.py
@@ -17,7 +17,7 @@
"""Tests for list settings"""
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
@@ -111,7 +111,7 @@
self.assertEqual(response.context["form"].initial['archivers'],
['mail-archive', 'mhonarc', 'prototype'])
response = self.client.post(
- url, {'archive_policy': 'public', 'archivers': ['prototype']})
+ url, {'archive_policy': 'public', 'archivers': ['prototype']})
self.assertRedirects(response, url)
self.assertHasSuccessMessage(response)
# Get a new list object to avoid caching
diff --git a/src/postorius/tests/mailman_api_tests/test_subscriptions.py b/src/postorius/tests/mailman_api_tests/test_subscriptions.py
index c3e14b8..a4019d3 100644
--- a/src/postorius/tests/mailman_api_tests/test_subscriptions.py
+++ b/src/postorius/tests/mailman_api_tests/test_subscriptions.py
@@ -65,8 +65,8 @@
self.assertEqual(len(self.open_list.members), 1)
self.assertEqual(len(self.open_list.requests), 0)
self.assertRedirects(
- response, reverse('list_summary',
- args=('open_list.example.com', )))
+ response, reverse('list_summary',
+ args=('open_list.example.com', )))
self.assertHasSuccessMessage(response)
def test_secondary_open(self):
@@ -78,8 +78,8 @@
self.assertEqual(len(self.open_list.members), 1)
self.assertEqual(len(self.open_list.requests), 0)
self.assertRedirects(
- response, reverse('list_summary',
- args=('open_list.example.com', )))
+ response, reverse('list_summary',
+ args=('open_list.example.com', )))
self.assertHasSuccessMessage(response)
def test_unknown_address(self):
@@ -91,8 +91,8 @@
self.assertEqual(len(self.open_list.members), 0)
self.assertEqual(len(self.open_list.requests), 0)
self.assertRedirects(
- response, reverse('list_summary',
- args=('open_list.example.com', )))
+ response, reverse('list_summary',
+ args=('open_list.example.com', )))
self.assertHasErrorMessage(response)
def test_subscribe_mod(self):
@@ -104,8 +104,8 @@
self.assertEqual(len(self.mod_list.members), 0)
self.assertEqual(len(self.mod_list.requests), 1)
self.assertRedirects(
- response, reverse('list_summary',
- args=('moderate_subs.example.com', )))
+ response, reverse('list_summary',
+ args=('moderate_subs.example.com', )))
self.assertHasSuccessMessage(response)
def test_secondary_mod(self):
@@ -117,8 +117,8 @@
self.assertEqual(len(self.mod_list.members), 0)
self.assertEqual(len(self.mod_list.requests), 1)
self.assertRedirects(
- response, reverse('list_summary',
- args=('moderate_subs.example.com', )))
+ response, reverse('list_summary',
+ args=('moderate_subs.example.com', )))
self.assertHasSuccessMessage(response)
def test_subscribe_mod_then_open(self):
@@ -142,10 +142,9 @@
self.mod_list.add_owner('owner@example.com')
self.client.logout()
self.client.login(username='testowner', password='pwd')
- accept_url = reverse(
- 'handle_subscription_request',
- args=['moderate_subs.example.com',
- self.mod_list.requests[0]['token'], 'accept'])
+ accept_url = reverse('handle_subscription_request', args=[
+ 'moderate_subs.example.com',
+ self.mod_list.requests[0]['token'], 'accept'])
response = self.client.get(accept_url)
self.assertRedirects(response,
reverse('list_subscription_requests',
@@ -162,9 +161,9 @@
test-3@example.org (Third Person)\n
test-4@example.org\n
<test-5@example.org>\n"""
- self.client.post(reverse('mass_subscribe',
- args=('open_list.example.com',)),
- {'emails': email_list})
+ self.client.post(
+ reverse('mass_subscribe', args=('open_list.example.com',)),
+ {'emails': email_list})
self.assertEqual(len(self.open_list.members), 5)
first = self.open_list.get_member('test-1@example.org')
second = self.open_list.get_member('test-2@example.org')
@@ -195,8 +194,8 @@
self.fail('The subscription was not changed')
self.assertEqual(member.email, 'fritz@example.org')
self.assertRedirects(
- response, reverse('list_summary',
- args=('open_list.example.com', )))
+ response, reverse('list_summary',
+ args=('open_list.example.com', )))
def test_change_subscription_confirm(self):
# The subscription is changed from an address to another
@@ -220,5 +219,5 @@
self.fail('The subscription was not changed')
self.assertEqual(member.email, 'fritz@example.org')
self.assertRedirects(
- response, reverse('list_summary',
- args=('confirm_list.example.com', )))
+ response, reverse('list_summary',
+ args=('confirm_list.example.com', )))
diff --git a/src/postorius/tests/mailman_api_tests/test_user.py b/src/postorius/tests/mailman_api_tests/test_user.py
index 94ed405..e28b3f7 100644
--- a/src/postorius/tests/mailman_api_tests/test_user.py
+++ b/src/postorius/tests/mailman_api_tests/test_user.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License along with
# Postorius. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
@@ -88,7 +88,7 @@
reverse('user_list_options', args=[self.foo_list.list_id]),
):
response = self.client.post(
- url, dict((pref, None) for pref in prefs_with_none))
+ url, dict((pref, None) for pref in prefs_with_none))
self.assertEqual(response.status_code, 302)
# Formsets
for url in ('user_address_preferences',
diff --git a/src/postorius/tests/test_auth_decorators.py b/src/postorius/tests/test_auth_decorators.py
index 00d06b5..44a3ff3 100644
--- a/src/postorius/tests/test_auth_decorators.py
+++ b/src/postorius/tests/test_auth_decorators.py
@@ -60,8 +60,8 @@
def test_not_authenticated(self, mock_get_list):
"""Should raise PermissionDenied if user is not authenticated."""
mock_get_list.return_value = self.mock_list
- request = self.request_factory.get('/lists/foolist.example.org/'
- 'settings/')
+ request = self.request_factory.get(
+ '/lists/foolist.example.org/settings/')
request.user = AnonymousUser()
self.assertRaises(PermissionDenied, dummy_function, request,
list_id='foolist.example.org')
@@ -70,12 +70,12 @@
def test_superuser(self, mock_get_list):
"""Should call the dummy method, if user is superuser."""
mock_get_list.return_value = self.mock_list
- request = self.request_factory.get('/lists/foolist.example.org/'
- 'settings/')
- request.user = User.objects.create_superuser('su1', 'su@sodo.org',
- 'pwd')
- return_value = dummy_function(request,
- list_id='foolist.example.org')
+ request = self.request_factory.get(
+ '/lists/foolist.example.org/settings/')
+ request.user = User.objects.create_superuser(
+ 'su1', 'su@sodo.org', 'pwd')
+ return_value = dummy_function(
+ request, list_id='foolist.example.org')
self.assertEqual(return_value, True)
@patch.object(Client, 'get_list')
@@ -85,10 +85,10 @@
self.mock_list.owners = ['geddy@rush.it']
mock_get_list.return_value = self.mock_list
# prepare request
- request = self.request_factory.get('/lists/foolist.example.org/'
- 'settings/')
- request.user = User.objects.create_user('les c', 'les@primus.org',
- 'pwd')
+ request = self.request_factory.get(
+ '/lists/foolist.example.org/settings/')
+ request.user = User.objects.create_user(
+ 'les c', 'les@primus.org', 'pwd')
self.assertRaises(PermissionDenied, dummy_function, request,
list_id='foolist.example.org')
@@ -99,12 +99,12 @@
self.mock_list.owners = ['les@primus.org']
mock_get_list.return_value = self.mock_list
# prepare request
- request = self.request_factory.get('/lists/foolist.example.org/'
- 'settings/')
- request.user = User.objects.create_user('les cl', 'les@primus.org',
- 'pwd')
- return_value = dummy_function(request,
- list_id='foolist.example.org')
+ request = self.request_factory.get(
+ '/lists/foolist.example.org/settings/')
+ request.user = User.objects.create_user(
+ 'les cl', 'les@primus.org', 'pwd')
+ return_value = dummy_function(
+ request, list_id='foolist.example.org')
self.assertEqual(return_value, True)
@@ -126,7 +126,7 @@
"""Should raise PermissionDenied if user is not authenticated."""
mock_get_list.return_value = self.mock_list
request = self.request_factory.get(
- '/lists/foolist.example.org/settings/')
+ '/lists/foolist.example.org/settings/')
request.user = AnonymousUser()
self.assertRaises(PermissionDenied, dummy_function_mod_req, request,
list_id='foolist.example.org')
@@ -136,11 +136,11 @@
"""Should call the dummy method, if user is superuser."""
mock_get_list.return_value = self.mock_list
request = self.request_factory.get(
- '/lists/foolist.example.org/settings/')
+ '/lists/foolist.example.org/settings/')
request.user = User.objects.create_superuser(
- 'su2', 'su@sodo.org', 'pwd')
+ 'su2', 'su@sodo.org', 'pwd')
return_value = dummy_function_mod_req(
- request, list_id='foolist.example.org')
+ request, list_id='foolist.example.org')
self.assertEqual(return_value, True)
@patch.object(Client, 'get_list')
@@ -151,9 +151,9 @@
mock_get_list.return_value = self.mock_list
# prepare request
request = self.request_factory.get(
- '/lists/foolist.example.org/settings/')
+ '/lists/foolist.example.org/settings/')
request.user = User.objects.create_user(
- 'les cl2', 'les@primus.org', 'pwd')
+ 'les cl2', 'les@primus.org', 'pwd')
self.assertRaises(PermissionDenied, dummy_function_mod_req, request,
list_id='foolist.example.org')
@@ -165,11 +165,11 @@
mock_get_list.return_value = self.mock_list
# prepare request
request = self.request_factory.get(
- '/lists/foolist.example.org/settings/')
+ '/lists/foolist.example.org/settings/')
request.user = User.objects.create_user(
- 'les cl3', 'les@primus.org', 'pwd')
+ 'les cl3', 'les@primus.org', 'pwd')
return_value = dummy_function_mod_req(
- request, list_id='foolist.example.org')
+ request, list_id='foolist.example.org')
self.assertEqual(return_value, True)
@patch.object(Client, 'get_list')
@@ -180,11 +180,11 @@
mock_get_list.return_value = self.mock_list
# prepare request
request = self.request_factory.get(
- '/lists/foolist.example.org/settings/')
+ '/lists/foolist.example.org/settings/')
request.user = User.objects.create_user(
- 'les cl4', 'les@primus.org', 'pwd')
+ 'les cl4', 'les@primus.org', 'pwd')
return_value = dummy_function_mod_req(
- request, list_id='foolist.example.org')
+ request, list_id='foolist.example.org')
self.assertEqual(return_value, True)
@@ -205,8 +205,8 @@
"""Should raise PermissionDenied if user is an anonymous user."""
mock_get_list.return_value = self.mock_list
- request = self.request_factory.get('/lists/foolist.example.org/'
- 'settings/')
+ request = self.request_factory.get(
+ '/lists/foolist.example.org/settings/')
request.user = AnonymousUser()
self.assertRaises(PermissionDenied, dummy_superuser_or_403, request)
@@ -215,10 +215,10 @@
"""Should raise PermissionDenied if user is a normal user."""
mock_get_list.return_value = self.mock_list
- request = self.request_factory.get('/lists/foolist.example.org/'
- 'settings/')
+ request = self.request_factory.get(
+ '/lists/foolist.example.org/settings/')
request.user = User.objects.create_user(
- 'new user', 'new@usersfactory.net', 'testing')
+ 'new user', 'new@usersfactory.net', 'testing')
self.assertRaises(PermissionDenied, dummy_superuser_or_403, request)
@patch.object(Client, 'get_list')
@@ -226,8 +226,8 @@
"""Should not raise PermissionDenied if user is superuser."""
mock_get_list.return_value = self.mock_list
- request = self.request_factory.get('/lists/foolist.example.org/'
- 'settings/')
- request.user = User.objects.create_superuser('new su', 'new@su.net',
- 'testing')
+ request = self.request_factory.get(
+ '/lists/foolist.example.org/settings/')
+ request.user = User.objects.create_superuser(
+ 'new su', 'new@su.net', 'testing')
self.assertTrue(dummy_superuser_or_403(request))
diff --git a/src/postorius/tests/test_forms.py b/src/postorius/tests/test_forms.py
index e71e4da..a5a5362 100644
--- a/src/postorius/tests/test_forms.py
+++ b/src/postorius/tests/test_forms.py
@@ -103,10 +103,10 @@
def test_form_fields_list_invalid(self):
form = ListNew({
- 'listname': 'xy#z',
- 'mail_host': 'mailman.most-desirable.org',
- 'list_owner': 'mailman.most-desirable.org',
- 'advertise': 'abcd',
- 'description': 'The Most Desirable organization',
+ 'listname': 'xy#z',
+ 'mail_host': 'mailman.most-desirable.org',
+ 'list_owner': 'mailman.most-desirable.org',
+ 'advertise': 'abcd',
+ 'description': 'The Most Desirable organization',
})
self.assertFalse(form.is_valid())
diff --git a/src/postorius/tests/utils.py b/src/postorius/tests/utils.py
index 7908b72..e3c18c6 100644
--- a/src/postorius/tests/utils.py
+++ b/src/postorius/tests/utils.py
@@ -143,4 +143,4 @@
def assertRedirectsToLogin(self, url):
response = self.client.get(url)
self.assertRedirects(response, '{}?next={}'.format(
- reverse(settings.LOGIN_URL), quote(url)))
+ reverse(settings.LOGIN_URL), quote(url)))
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 0731b59..20a6473 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -38,15 +38,14 @@
from postorius import utils
from postorius.forms import (
- ListNew, MemberForm, ListSubscribe, MultipleChoiceForm,
- ListSubscriptionPolicyForm, ArchiveSettingsForm,
- MessageAcceptanceForm, DigestSettingsForm, AlterMessagesForm,
- ListAutomaticResponsesForm, ListIdentityForm, UserPreferences,
- ListMassSubscription, ListMassRemoval, ListAddBanForm,
- ListHeaderMatchForm, ListHeaderMatchFormset, MemberModeration)
+ ListNew, MemberForm, ListSubscribe, MultipleChoiceForm, UserPreferences,
+ ListSubscriptionPolicyForm, ArchiveSettingsForm, MessageAcceptanceForm,
+ DigestSettingsForm, AlterMessagesForm, ListAutomaticResponsesForm,
+ ListIdentityForm, ListMassSubscription, ListMassRemoval, ListAddBanForm,
+ ListHeaderMatchForm, ListHeaderMatchFormset, MemberModeration)
from postorius.models import Domain, List, MailmanApiError, Mailman404Error
-from postorius.auth.decorators import (list_owner_required,
- list_moderator_required)
+from postorius.auth.decorators import (
+ list_owner_required, list_moderator_required)
from postorius.views.generic import MailingListView
@@ -75,12 +74,12 @@
if member_form.is_valid():
try:
getattr(mailing_list, 'add_%s' % role)(
- member_form.cleaned_data['email'])
+ member_form.cleaned_data['email'])
messages.success(
- request, _('%(email)s has been added'
- ' with the role %(role)s')
- % {'email': member_form.cleaned_data['email'],
- 'role': role})
+ request, _('%(email)s has been added'
+ ' with the role %(role)s')
+ % {'email': member_form.cleaned_data['email'],
+ 'role': role})
return redirect('list_members', list_id, role)
except HTTPError as e:
messages.error(request, _(e.msg))
@@ -98,7 +97,7 @@
if "*" not in query:
query = '*{}*'.format(query)
# Proxy the find_members method to insert the query
- method = lambda count, page: mailing_list.find_members(
+ method = lambda count, page: mailing_list.find_members(
query, count=count, page=page)
else:
method = mailing_list.get_member_page
@@ -109,7 +108,7 @@
context['empty_error'] = _('List has no Subscribers')
else:
context['empty_error'] =\
- _('No member was found matching the search')
+ _('No member was found matching the search')
context['count_options'] = [25, 50, 100, 200]
context['form'] = form
else:
@@ -330,10 +329,10 @@
pre_confirmed=True,
pre_approved=True)
messages.success(
- request, _('The address %(address)s has been'
- ' subscribed to %(list)s.') %
- {'address': address,
- 'list': mailing_list.fqdn_listname})
+ request, _('The address %(address)s has been'
+ ' subscribed to %(list)s.') %
+ {'address': address,
+ 'list': mailing_list.fqdn_listname})
except MailmanApiError:
return utils.render_api_error(request)
except HTTPError as e:
@@ -369,10 +368,10 @@
validate_email(address)
self.mailing_list.unsubscribe(address.lower())
messages.success(
- request, _('The address %(address)s has been'
- ' unsubscribed from %(list)s.') %
- {'address': address,
- 'list': self.mailing_list.fqdn_listname})
+ request, _('The address %(address)s has been'
+ ' unsubscribed from %(list)s.') %
+ {'address': address,
+ 'list': self.mailing_list.fqdn_listname})
except MailmanApiError:
return utils.render_api_error(request)
except (HTTPError, ValueError) as e:
@@ -870,6 +869,6 @@
del form_new.fields['DELETE']
return render(request, 'postorius/lists/header_matches.html', {
- 'list': m_list,
- 'formset': formset,
- })
+ 'list': m_list,
+ 'formset': formset,
+ })
diff --git a/src/postorius/views/rest.py b/src/postorius/views/rest.py
index 550c19b..1d21b55 100644
--- a/src/postorius/views/rest.py
+++ b/src/postorius/views/rest.py
@@ -71,7 +71,7 @@
raise Http404(_('Message does not exist'))
held_message = List.objects.get_or_404(
- fqdn_listname=list_id).get_held_message(held_id)
+ fqdn_listname=list_id).get_held_message(held_id)
if 'raw' in request.GET:
return HttpResponse(held_message.msg, content_type='text/plain')
response_data = dict()
@@ -89,8 +89,8 @@
for attachment in attachments:
counter, name, content_type, encoding, content = attachment
response_data['attachments'].append(
- (reverse('rest_attachment_for_held_message',
- args=(list_id, held_id, counter)), name))
+ (reverse('rest_attachment_for_held_message',
+ args=(list_id, held_id, counter)), name))
return HttpResponse(json.dumps(response_data),
content_type='application/json')
@@ -100,7 +100,7 @@
@list_moderator_required
def get_attachment_for_held_message(request, list_id, held_id, attachment_id):
held_message = List.objects.get_or_404(
- fqdn_listname=list_id).get_held_message(held_id)
+ fqdn_listname=list_id).get_held_message(held_id)
attachments = get_attachments(held_message.msg)
for attachment in attachments:
if attachment[0] == int(attachment_id):
diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py
index c76668c..887bcf8 100644
--- a/src/postorius/views/user.py
+++ b/src/postorius/views/user.py
@@ -81,7 +81,7 @@
def get(self, request):
try:
mm_user = MailmanUser.objects.get_or_create_from_django(
- request.user)
+ request.user)
except MailmanApiError:
return utils.render_api_error(request)
settingsform = UserPreferences(initial=mm_user.preferences)
@@ -171,7 +171,7 @@
form = UserPreferences(initial=subscription.preferences)
user_emails = [request.user.email] + request.user.other_emails
subscription_form = ChangeSubscriptionForm(
- user_emails, initial={'email': subscription.email})
+ user_emails, initial={'email': subscription.email})
return render(request, 'postorius/user/list_options.html',
{'form': form, 'list': mlist,
'change_subscription_form': subscription_form})
@@ -250,7 +250,7 @@
if request.POST.get('formname') == 'displayname':
display_name_form = ChangeDisplayNameForm(request.POST)
form = AddressActivationForm(
- initial={'user_email': request.user.email})
+ initial={'user_email': request.user.email})
if display_name_form.is_valid():
name = display_name_form.cleaned_data['display_name']
try:
@@ -265,13 +265,13 @@
return redirect('user_profile')
else:
display_name_form = ChangeDisplayNameForm(
- initial={'display_name': mm_user.display_name})
+ initial={'display_name': mm_user.display_name})
form = AddressActivationForm(request.POST)
if form.is_valid():
profile, c = (
AddressConfirmationProfile.objects.update_or_create(
- email=form.cleaned_data['email'], user=request.user,
- defaults={'activation_key': uuid.uuid4().hex}))
+ email=form.cleaned_data['email'], user=request.user,
+ defaults={'activation_key': uuid.uuid4().hex}))
try:
profile.send_confirmation_link(request)
messages.success(request, _(
@@ -288,9 +288,9 @@
' please try again later'))
else:
form = AddressActivationForm(
- initial={'user_email': request.user.email})
+ initial={'user_email': request.user.email})
display_name_form = ChangeDisplayNameForm(
- initial={'display_name': mm_user.display_name})
+ initial={'display_name': mm_user.display_name})
return render(request, 'postorius/user/profile.html',
{'mm_user': mm_user, 'form': form,
'name_form': display_name_form})
@@ -316,10 +316,10 @@
try:
try:
mailman_user = MailmanUser.objects.get(
- address=request.user.email)
+ address=request.user.email)
except Mailman404Error:
mailman_user = MailmanUser.objects.create(
- request.user.email, '')
+ request.user.email, '')
mm_address = mailman_user.add_address(profile.email)
# The address has just been verified.
mm_address.verify()