diff options
| author | Barry Warsaw | 2016-03-27 22:14:47 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2016-03-27 22:14:47 -0400 |
| commit | 532045c68c6325fa90d74572b6c035c666470849 (patch) | |
| tree | e5acc8183a22cb03ac30d155675904fb23ca05fb /src/mailman/commands | |
| parent | d13e7ece87ceefadcb5273e93e5b0caeade0e600 (diff) | |
| download | mailman-532045c68c6325fa90d74572b6c035c666470849.tar.gz mailman-532045c68c6325fa90d74572b6c035c666470849.tar.zst mailman-532045c68c6325fa90d74572b6c035c666470849.zip | |
Diffstat (limited to 'src/mailman/commands')
| -rw-r--r-- | src/mailman/commands/cli_import.py | 2 | ||||
| -rw-r--r-- | src/mailman/commands/tests/test_control.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mailman/commands/cli_import.py b/src/mailman/commands/cli_import.py index ecb879a5a..126c026d0 100644 --- a/src/mailman/commands/cli_import.py +++ b/src/mailman/commands/cli_import.py @@ -26,7 +26,7 @@ from mailman.core.i18n import _ from mailman.database.transaction import transactional from mailman.interfaces.command import ICLISubCommand from mailman.interfaces.listmanager import IListManager -from mailman.utilities.importer import import_config_pck, Import21Error +from mailman.utilities.importer import Import21Error, import_config_pck from zope.component import getUtility from zope.interface import implementer diff --git a/src/mailman/commands/tests/test_control.py b/src/mailman/commands/tests/test_control.py index b25c63185..26d921cd7 100644 --- a/src/mailman/commands/tests/test_control.py +++ b/src/mailman/commands/tests/test_control.py @@ -21,13 +21,13 @@ import os import sys import time import errno -import signal import shutil +import signal import socket import unittest from contextlib import ExitStack, suppress -from datetime import timedelta, datetime +from datetime import datetime, timedelta from mailman.commands.cli_control import Start, kill_watcher from mailman.config import Configuration, config from mailman.testing.helpers import configuration |
