diff options
Diffstat (limited to 'src/mailman')
| -rw-r--r-- | src/mailman/utilities/importer.py | 4 | ||||
| -rw-r--r-- | src/mailman/utilities/tests/test_import.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py index 333cbd1bd..1c48f257f 100644 --- a/src/mailman/utilities/importer.py +++ b/src/mailman/utilities/importer.py @@ -22,7 +22,7 @@ from __future__ import absolute_import, print_function, unicode_literals __metaclass__ = type __all__ = [ 'import_config_pck', - 'ImportError', + 'Import21Error', ] @@ -62,7 +62,7 @@ def str_to_unicode(value): for encoding in ("ascii", "utf-8"): try: return unicode(value, encoding) - except UnicodeDecodeError, e: + except UnicodeDecodeError: continue # we did our best, use replace return unicode(value, 'ascii', 'replace') diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py index 34ff7eb3c..4abdd7dc0 100644 --- a/src/mailman/utilities/tests/test_import.py +++ b/src/mailman/utilities/tests/test_import.py @@ -34,7 +34,6 @@ from traceback import format_exc from mailman.config import config from mailman.app.lifecycle import create_list, remove_list -from mailman.interfaces.archiver import ArchivePolicy from mailman.testing.layers import ConfigLayer from mailman.utilities.importer import import_config_pck, Import21Error from mailman.interfaces.archiver import ArchivePolicy @@ -47,7 +46,7 @@ from mailman.interfaces.nntp import NewsgroupModeration from mailman.interfaces.autorespond import ResponseAction from mailman.interfaces.templates import ITemplateLoader from mailman.interfaces.usermanager import IUserManager -from mailman.interfaces.member import DeliveryMode, DeliveryStatus, MemberRole +from mailman.interfaces.member import DeliveryMode, DeliveryStatus from mailman.interfaces.languages import ILanguageManager from mailman.model.address import Address from mailman.handlers.decorate import decorate |