diff options
6 files changed, 7 insertions, 8 deletions
diff --git a/src/mailman/app/tests/test_moderation.py b/src/mailman/app/tests/test_moderation.py index 9217ef4f5..63b665948 100644 --- a/src/mailman/app/tests/test_moderation.py +++ b/src/mailman/app/tests/test_moderation.py @@ -24,8 +24,8 @@ from mailman.app.moderator import ( handle_message, handle_unsubscription, hold_message, hold_unsubscription) from mailman.interfaces.action import Action from mailman.interfaces.messages import IMessageStore -from mailman.interfaces.subscriptions import ISubscriptionManager from mailman.interfaces.requests import IListRequests +from mailman.interfaces.subscriptions import ISubscriptionManager from mailman.interfaces.usermanager import IUserManager from mailman.runners.incoming import IncomingRunner from mailman.runners.outgoing import OutgoingRunner @@ -35,7 +35,7 @@ from mailman.testing.helpers import ( specialized_message_from_string as mfs) from mailman.testing.layers import SMTPLayer from mailman.utilities.datetime import now -from zope.component import getUtility, getAdapter +from zope.component import getAdapter, getUtility class TestModeration(unittest.TestCase): diff --git a/src/mailman/app/tests/test_unsubscriptions.py b/src/mailman/app/tests/test_unsubscriptions.py index b13987fbb..b7693f774 100644 --- a/src/mailman/app/tests/test_unsubscriptions.py +++ b/src/mailman/app/tests/test_unsubscriptions.py @@ -19,7 +19,6 @@ import unittest - from contextlib import suppress from mailman.app.lifecycle import create_list from mailman.app.subscriptions import UnSubscriptionWorkflow diff --git a/src/mailman/app/tests/test_workflowmanager.py b/src/mailman/app/tests/test_workflowmanager.py index 047291838..f72486111 100644 --- a/src/mailman/app/tests/test_workflowmanager.py +++ b/src/mailman/app/tests/test_workflowmanager.py @@ -28,7 +28,7 @@ from mailman.interfaces.usermanager import IUserManager from mailman.testing.helpers import get_queue_messages from mailman.testing.layers import ConfigLayer from mailman.utilities.datetime import now -from zope.component import getUtility, getAdapter +from zope.component import getAdapter, getUtility class TestRegistrar(unittest.TestCase): diff --git a/src/mailman/database/alembic/versions/448a93984c35_unsubscription_workflow.py b/src/mailman/database/alembic/versions/448a93984c35_unsubscription_workflow.py index 106d9d5e0..85003bd1e 100644 --- a/src/mailman/database/alembic/versions/448a93984c35_unsubscription_workflow.py +++ b/src/mailman/database/alembic/versions/448a93984c35_unsubscription_workflow.py @@ -6,6 +6,7 @@ Create Date: 2016-06-02 14:34:24.154723 """ import sqlalchemy as sa + from alembic import op from mailman.database.helpers import exists_in_db from mailman.database.types import Enum diff --git a/src/mailman/rest/tests/test_moderation.py b/src/mailman/rest/tests/test_moderation.py index 374398502..cbf9c9381 100644 --- a/src/mailman/rest/tests/test_moderation.py +++ b/src/mailman/rest/tests/test_moderation.py @@ -24,8 +24,8 @@ from mailman.app.moderator import hold_message from mailman.database.transaction import transaction from mailman.interfaces.bans import IBanManager from mailman.interfaces.mailinglist import SubscriptionPolicy -from mailman.interfaces.subscriptions import ISubscriptionManager from mailman.interfaces.requests import IListRequests, RequestType +from mailman.interfaces.subscriptions import ISubscriptionManager from mailman.interfaces.usermanager import IUserManager from mailman.testing.helpers import ( call_api, get_queue_messages, set_preferred, diff --git a/src/mailman/runners/tests/test_leave.py b/src/mailman/runners/tests/test_leave.py index 1b601f0c2..008e8eb57 100644 --- a/src/mailman/runners/tests/test_leave.py +++ b/src/mailman/runners/tests/test_leave.py @@ -23,14 +23,13 @@ from email.iterators import body_line_iterator from mailman.app.lifecycle import create_list from mailman.config import config from mailman.database.transaction import transaction -from mailman.interfaces.usermanager import IUserManager from mailman.interfaces.mailinglist import SubscriptionPolicy +from mailman.interfaces.usermanager import IUserManager from mailman.runners.command import CommandRunner from mailman.testing.helpers import ( - get_queue_messages, make_testable_runner, + get_queue_messages, make_testable_runner, set_preferred, specialized_message_from_string as mfs) from mailman.testing.layers import ConfigLayer -from mailman.testing.helpers import set_preferred from zope.component import getUtility |