diff options
Diffstat (limited to 'src/mailman/model/mailinglist.py')
| -rw-r--r-- | src/mailman/model/mailinglist.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py index 51d322dbc..fe35f6127 100644 --- a/src/mailman/model/mailinglist.py +++ b/src/mailman/model/mailinglist.py @@ -22,7 +22,7 @@ import os from mailman.config import config from mailman.database.model import Model from mailman.database.transaction import dbconnection -from mailman.database.types import Enum, SAUnicode +from mailman.database.types import Enum, SAUnicode, SAUnicodeLarge from mailman.interfaces.action import Action, FilterAction from mailman.interfaces.address import IAddress from mailman.interfaces.archiver import ArchivePolicy @@ -32,7 +32,7 @@ from mailman.interfaces.digests import DigestFrequency from mailman.interfaces.domain import IDomainManager from mailman.interfaces.languages import ILanguageManager from mailman.interfaces.mailinglist import ( - DMARCModerationAction, FromIsList, IAcceptableAlias, IAcceptableAliasSet, + DMARCMitigateAction, IAcceptableAlias, IAcceptableAliasSet, IHeaderMatch, IHeaderMatchList, IListArchiver, IListArchiverSet, IMailingList, Personalization, ReplyToMunging, SubscriptionPolicy) from mailman.interfaces.member import ( @@ -128,12 +128,10 @@ class MailingList(Model): Enum(UnrecognizedBounceDisposition)) process_bounces = Column(Boolean) # DMARC - dmarc_moderation_action = Column(Enum(DMARCModerationAction)) - dmarc_quarantine_moderation_action = Column(Boolean) - dmarc_none_moderation_action = Column(Boolean) - dmarc_moderation_notice = Column(SAUnicode) - dmarc_wrapped_message_text = Column(SAUnicode) - from_is_list = Column(Enum(FromIsList)) + dmarc_mitigate_action = Column(Enum(DMARCMitigateAction)) + dmarc_mitigate_unconditionally = Column(Boolean) + dmarc_moderation_notice = Column(SAUnicodeLarge) + dmarc_wrapped_message_text = Column(SAUnicodeLarge) # Miscellaneous default_member_action = Column(Enum(Action)) default_nonmember_action = Column(Enum(Action)) |