* `passlib`_ is now used for all password hashing instead of flufl.password.

   The default hash is `sha512_crypt`.
 * Events renamed and moved:
   * `mailman.chains.accept.AcceptNotification`
   * `mailman.chains.base.ChainNotification`
   * `mailman.chains.discard.DiscardNotification`
   * `mailman.chains.hold.HoldNotification`
   * `mailman.chains.owner.OwnerNotification`
   * `mailman.chains.reject.RejectNotification`
   changed to (respectively):
   * `mailman.interfaces.chains.AcceptEvent`
   * `mailman.interfaces.chains.ChainEvent`
   * `mailman.interfaces.chains.DiscardEvent`
   * `mailman.interfaces.chains.HoldEvent`
   * `mailman.interfaces.chains.AcceptOwnerEvent`
   * `mailman.interfaces.chains.RejectEvent`
 * A `ConfigurationUpdatedEvent` is triggered when the system-wide global
   configuration stack is pushed or popped.
 * With the switch to `passlib`_, `[passwords]password_scheme` has been
   removed.  Instead use `[passwords]path` to specify where to find the
   `passlib.cfg` file.  See the comments in `schema.cfg` for details.

2 files changed, 8 insertions, 6 deletions

diff --git a/src/mailman/rules/docs/approved.rst b/src/mailman/rules/docs/approved.rst
index 7f0714e17..3f3d54455 100644
--- a/src/mailman/rules/docs/approved.rst
+++ b/src/mailman/rules/docs/approved.rst
@@ -20,8 +20,8 @@ which is shared among all the administrators.
 This password will not be stored in clear text, so it must be hashed using the
 configured hash protocol.
 
-    >>> from mailman.utilities.passwords import encrypt
-    >>> mlist.moderator_password = encrypt('super secret')
+    >>> mlist.moderator_password = config.password_context.encrypt(
+    ...     'super secret')
 
 The ``approved`` rule determines whether the message contains the proper
 approval or not.
diff --git a/src/mailman/rules/docs/header-matching.rst b/src/mailman/rules/docs/header-matching.rst
index 021974e69..20e55fadd 100644
--- a/src/mailman/rules/docs/header-matching.rst
+++ b/src/mailman/rules/docs/header-matching.rst
@@ -74,17 +74,19 @@ The header may exist and match the pattern.  By default, when the header
 matches, it gets held for moderator approval.
 ::
 
+    >>> from mailman.interfaces.chain import ChainEvent
     >>> from mailman.testing.helpers import event_subscribers
     >>> def handler(event):
-    ...     print event.__class__.__name__, \
-    ...           event.chain.name, event.msg['message-id']
+    ...     if isinstance(event, ChainEvent):
+    ...         print event.__class__.__name__, \
+    ...             event.chain.name, event.msg['message-id']
 
     >>> del msg['x-spam-score']
     >>> msg['X-Spam-Score'] = '*****'
     >>> msgdata = {}
     >>> with event_subscribers(handler):
     ...     process(mlist, msg, msgdata, 'header-match')
-    HoldNotification hold <ant>
+    HoldEvent hold <ant>
 
     >>> hits_and_misses(msgdata)
     Rule hits:
@@ -100,7 +102,7 @@ discard such messages.
     >>> with event_subscribers(handler):
     ...     with configuration('antispam', jump_chain='discard'):
     ...         process(mlist, msg, msgdata, 'header-match')
-    DiscardNotification discard <ant>
+    DiscardEvent discard <ant>
 
 These programmatically added headers can be removed by flushing the chain.
 Now, nothing with match this message.