Merge branch 'mr215-review' of gitlab.com:warsaw/mailman into dmarc and

resolve conflicts.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mailman/commands/docs/aliases.rst b/src/mailman/commands/docs/aliases.rst
index 75a9d3c11..31fda21e4 100644
--- a/src/mailman/commands/docs/aliases.rst
+++ b/src/mailman/commands/docs/aliases.rst
@@ -34,7 +34,7 @@ write the appropriate files to a temporary directory.
 
     >>> import os, shutil, tempfile
     >>> output_directory = tempfile.mkdtemp()
-    >>> cleanups.append((shutil.rmtree, output_directory))
+    >>> ignore = cleanups.callback(shutil.rmtree, output_directory)
 
     >>> FakeArgs.directory = output_directory
     >>> mlist = create_list('test@example.com')
diff --git a/src/mailman/commands/docs/info.rst b/src/mailman/commands/docs/info.rst
index 5cea9ee2c..6fce70783 100644
--- a/src/mailman/commands/docs/info.rst
+++ b/src/mailman/commands/docs/info.rst
@@ -51,7 +51,7 @@ system paths that Mailman is using.
     ... [mailman]
     ... layout: fhs
     ... """)
-    >>> cleanups.append((config.pop, 'fhs'))
+    >>> ignore = cleanups.callback(config.pop, 'fhs')
     >>> config.create_paths = True
 
 The `Filesystem Hierarchy Standard`_ layout is the same everywhere by