diff options
| -rw-r--r-- | src/mailman/utilities/importer.py | 7 | ||||
| -rw-r--r-- | src/mailman/utilities/tests/test_import.py | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py index 5b2be9742..baaa0e020 100644 --- a/src/mailman/utilities/importer.py +++ b/src/mailman/utilities/importer.py @@ -152,6 +152,7 @@ enabled: yes # Attributes in Mailman 2 which have a different type in Mailman 3. TYPES = dict( + allow_list_posts=bool, autorespond_owner=ResponseAction, autorespond_postings=ResponseAction, autorespond_requests=ResponseAction, @@ -161,20 +162,20 @@ TYPES = dict( default_member_action=member_action_mapping, default_nonmember_action=nonmember_action_mapping, digest_volume_frequency=DigestFrequency, + encode_ascii_prefixes=bool, filter_action=filter_action_mapping, filter_extensions=list_members_to_unicode, filter_types=list_members_to_unicode, forward_unrecognized_bounces_to=UnrecognizedBounceDisposition, + include_rfc2369_headers=bool, moderator_password=unicode_to_string, newsgroup_moderation=NewsgroupModeration, + nntp_prefix_subject_too=bool, pass_extensions=list_members_to_unicode, pass_types=list_members_to_unicode, personalize=Personalization, preferred_language=check_language_code, reply_goes_to_list=ReplyToMunging, - allow_list_posts=bool, - include_rfc2369_headers=bool, - nntp_prefix_subject_too=bool, ) diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py index 308fa8af2..e6eb9344c 100644 --- a/src/mailman/utilities/tests/test_import.py +++ b/src/mailman/utilities/tests/test_import.py @@ -34,6 +34,7 @@ import unittest from datetime import timedelta, datetime from enum import Enum from pkg_resources import resource_filename +from sqlalchemy.exc import IntegrityError from zope.component import getUtility from mailman.app.lifecycle import create_list @@ -291,6 +292,15 @@ class TestBasicImport(unittest.TestCase): else: self.fail('Import21Error was not raised') + def test_encode_ascii_prefixes(self): + self._pckdict['encode_ascii_prefixes'] = 2 + self.assertEqual(self._mlist.encode_ascii_prefixes, False) + try: + self._import() + except IntegrityError as e: + self.fail(e) + self.assertEqual(self._mlist.encode_ascii_prefixes, True) + class TestArchiveImport(unittest.TestCase): |