diff options
Diffstat (limited to 'Mailman')
| -rwxr-xr-x | Mailman/MailList.py | 6 | ||||
| -rw-r--r-- | Mailman/Version.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 0d47d812..00ee4c04 100755 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -386,6 +386,10 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, mm_cfg.DEFAULT_DEFAULT_MEMBER_MODERATION # Emergency moderation bit self.emergency = 0 + self.member_verbosity_threshold = ( + mm_cfg.DEFAULT_MEMBER_VERBOSITY_THRESHOLD) + self.member_verbosity_interval = ( + mm_cfg.DEFAULT_MEMBER_VERBOSITY_INTERVAL) # This really ought to default to mm_cfg.HOLD, but that doesn't work # with the current GUI description model. So, 0==Hold, 1==Reject, # 2==Discard @@ -394,6 +398,8 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, self.dmarc_moderation_action = mm_cfg.DEFAULT_DMARC_MODERATION_ACTION self.dmarc_quarantine_moderation_action = ( mm_cfg.DEFAULT_DMARC_QUARANTINE_MODERATION_ACTION) + self.dmarc_none_moderation_action = ( + mm_cfg.DEFAULT_DMARC_NONE_MODERATION_ACTION) self.dmarc_moderation_notice = '' self.dmarc_wrapped_message_text = ( mm_cfg.DEFAULT_DMARC_WRAPPED_MESSAGE_TEXT) diff --git a/Mailman/Version.py b/Mailman/Version.py index d26c157e..091e0c54 100644 --- a/Mailman/Version.py +++ b/Mailman/Version.py @@ -16,7 +16,7 @@ # USA. # Mailman version -VERSION = '2.1.21rc1' +VERSION = '2.1.21rc2' # And as a hex number in the manner of PY_VERSION_HEX ALPHA = 0xa @@ -31,7 +31,7 @@ MINOR_REV = 1 MICRO_REV = 21 REL_LEVEL = GAMMA # at most 15 beta releases! -REL_SERIAL = 1 +REL_SERIAL = 2 HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) | (REL_LEVEL << 4) | (REL_SERIAL << 0)) |