diff --git a/src/postorius/auth/decorators.py b/src/postorius/auth/decorators.py index 80f39dc..1b4ea88 100644 --- a/src/postorius/auth/decorators.py +++ b/src/postorius/auth/decorators.py @@ -29,7 +29,7 @@ def wrapper(*args, **kwargs): request = args[0] if request.user.is_authenticated(): - print 'already logged in' + print('already logged in') if not request.user.is_authenticated(): if request.META.has_key('HTTP_AUTHORIZATION'): authmeth, auth = request.META['HTTP_AUTHORIZATION'].split(' ', diff --git a/src/postorius/forms.py b/src/postorius/forms.py index d24651c..a13d814 100644 --- a/src/postorius/forms.py +++ b/src/postorius/forms.py @@ -19,7 +19,7 @@ from django import forms from django.core.validators import validate_email, URLValidator from django.utils.translation import ugettext_lazy as _ -from fieldset_forms import FieldsetForm +from postorius.fieldset_forms import FieldsetForm class DomainNew(FieldsetForm): @@ -560,7 +560,7 @@ class ListSubscriptionPolicyForm(forms.Form): """ List subscription policy settings. - """ + """ subscription_policy = forms.ChoiceField( label=_('Subscription Policy'), choices=SUBSCRIPTION_POLICY_CHOICES, diff --git a/src/postorius/models.py b/src/postorius/models.py index a11584b..bdc7ee8 100644 --- a/src/postorius/models.py +++ b/src/postorius/models.py @@ -37,8 +37,10 @@ from django.template.loader import get_template from mailmanclient import MailmanConnectionError from postorius.utils import get_client -from urllib2 import HTTPError - +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError logger = logging.getLogger(__name__) diff --git a/src/postorius/tests/mailman_api_tests/test_archival_options.py b/src/postorius/tests/mailman_api_tests/test_archival_options.py index 5974087..199b93a 100644 --- a/src/postorius/tests/mailman_api_tests/test_archival_options.py +++ b/src/postorius/tests/mailman_api_tests/test_archival_options.py @@ -30,7 +30,10 @@ from django.core.urlresolvers import reverse from django.test import Client, RequestFactory, TestCase from django.test.utils import override_settings -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius.forms import ListArchiverForm from postorius.tests import MM_VCR @@ -122,7 +125,7 @@ archivers = self.m_list.archivers # Archiver is enabled by default. self.assertTrue(archivers['mail-archive']) - + with MM_VCR.use_cassette('test_list_archival_options_disable_archiver.yaml'): # Archiver is disabled after it's deactivated in the form. response = self.client.post( @@ -156,7 +159,7 @@ self.assertTrue('foo-archiver' in mock_warning.call_args[0][1]) # messages.success should not have been called. self.assertEqual(mock_success.call_count, 0) - + @mock.patch('django.contrib.messages.success') @mock.patch('django.contrib.messages.warning') def test_success_messages(self, mock_warning, mock_success): diff --git a/src/postorius/tests/mailman_api_tests/test_list_index.py b/src/postorius/tests/mailman_api_tests/test_list_index.py index ce86115..d7d71ac 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_index.py +++ b/src/postorius/tests/mailman_api_tests/test_list_index.py @@ -20,7 +20,10 @@ from django.core.urlresolvers import reverse from django.test import Client, SimpleTestCase from django.test.utils import override_settings -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius.utils import get_client from postorius.tests import MM_VCR 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 21884d5..cd90f8d 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_members.py +++ b/src/postorius/tests/mailman_api_tests/test_list_members.py @@ -20,7 +20,10 @@ from django.core.urlresolvers import reverse from django.test import Client, TestCase from django.test.utils import override_settings -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius.tests import MM_VCR from postorius.utils import get_client diff --git a/src/postorius/tests/mailman_api_tests/test_list_new.py b/src/postorius/tests/mailman_api_tests/test_list_new.py index 49e6224..2824b78 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_new.py +++ b/src/postorius/tests/mailman_api_tests/test_list_new.py @@ -21,7 +21,10 @@ from django.core.urlresolvers import reverse from django.test import Client, SimpleTestCase from django.test.utils import override_settings -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius.utils import get_client from postorius.tests import MM_VCR diff --git a/src/postorius/tests/mailman_api_tests/test_list_summary.py b/src/postorius/tests/mailman_api_tests/test_list_summary.py index dbe927d..acb50d7 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_summary.py +++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py @@ -21,7 +21,10 @@ from django.db import IntegrityError from django.test import Client, SimpleTestCase from django.test.utils import override_settings -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius.utils import get_client from postorius.tests import MM_VCR diff --git a/src/postorius/tests/mailman_api_tests/test_models.py b/src/postorius/tests/mailman_api_tests/test_models.py index e3278c6..655ea42 100644 --- a/src/postorius/tests/mailman_api_tests/test_models.py +++ b/src/postorius/tests/mailman_api_tests/test_models.py @@ -21,7 +21,10 @@ from django.db import IntegrityError from django.test import Client, SimpleTestCase from django.test.utils import override_settings -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius.utils import get_client from postorius.tests import MM_VCR diff --git a/src/postorius/tests/mailman_api_tests/test_subscriptions.py b/src/postorius/tests/mailman_api_tests/test_subscriptions.py index 5216408..6bdd987 100644 --- a/src/postorius/tests/mailman_api_tests/test_subscriptions.py +++ b/src/postorius/tests/mailman_api_tests/test_subscriptions.py @@ -20,7 +20,10 @@ from django.core.urlresolvers import reverse from django.test import Client, TestCase from django.test.utils import override_settings -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius.tests import MM_VCR from postorius.utils import get_client diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index 890e6cc..304d7cc 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -30,8 +30,10 @@ from django.core.exceptions import ValidationError from django.utils.decorators import method_decorator from django.utils.translation import gettext as _ -from urllib2 import HTTPError - +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius import utils from postorius.models import (Domain, List, MailmanApiError) from postorius.forms import * @@ -255,7 +257,7 @@ @method_decorator(login_required) def post(self, request, list_id): """ - Subscribes an email address to a mailing list via POST and + Subscribes an email address to a mailing list via POST and redirects to the `list_summary` view. """ try: diff --git a/src/postorius/views/settings.py b/src/postorius/views/settings.py index a73167a..68bdf07 100644 --- a/src/postorius/views/settings.py +++ b/src/postorius/views/settings.py @@ -35,8 +35,10 @@ from django.template import Context, loader, RequestContext from django.utils.decorators import method_decorator from django.utils.translation import gettext as _ -from urllib2 import HTTPError - +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius import utils from postorius.models import (Domain, List, Member, MailmanUser, MailmanApiError, Mailman404Error) diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py index 950b6c4..4c9d826 100644 --- a/src/postorius/views/user.py +++ b/src/postorius/views/user.py @@ -31,7 +31,10 @@ from django.utils.decorators import method_decorator from django.utils.translation import gettext as _ from django.views.generic import TemplateView -from urllib2 import HTTPError +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError from postorius import utils from postorius.models import ( @@ -227,7 +230,7 @@ class AddressActivationView(TemplateView): """ - Starts the process of adding additional email addresses to a mailman user + Starts the process of adding additional email addresses to a mailman user record. Forms are processes and email notifications are sent accordingly. """ @@ -367,8 +370,8 @@ def address_activation_link(request, activation_key): """ Checks the given activation_key. If it is valid, the saved address will be - added to mailman. Also, the corresponding profile record will be removed. - If the key is not valid, it will be ignored. + added to mailman. Also, the corresponding profile record will be removed. + If the key is not valid, it will be ignored. """ try: profile = AddressConfirmationProfile.objects.get(