app/docs and app.tests all pass now.

2 files changed, 1 insertions, 7 deletions

diff --git a/src/mailman/app/docs/hooks.rst b/src/mailman/app/docs/hooks.rst
index 8b616f1b2..ba9bb249e 100644
--- a/src/mailman/app/docs/hooks.rst
+++ b/src/mailman/app/docs/hooks.rst
@@ -61,6 +61,7 @@ script that will produce no output to force the hooks to run.
     ...     proc = subprocess.Popen(
     ...         [exe, 'lists', '--domain', 'ignore', '-q'],
     ...         cwd=ConfigLayer.root_directory, env=env,
+    ...         universal_newlines=True,
     ...         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     ...     stdout, stderr = proc.communicate()
     ...     assert proc.returncode == 0, stderr
diff --git a/src/mailman/app/docs/subscriptions.rst b/src/mailman/app/docs/subscriptions.rst
index 8c3d8b28d..eaccdc3cc 100644
--- a/src/mailman/app/docs/subscriptions.rst
+++ b/src/mailman/app/docs/subscriptions.rst
@@ -67,13 +67,6 @@ New members can also be added by providing an existing user id instead of an
 email address.  However, the user must have a preferred email address.
 ::
 
-    >>> service.join('test.example.com', bart.user.user_id,
-    ...              role=MemberRole.owner)
-    Traceback (most recent call last):
-    ...
-    MissingPreferredAddressError: User must have a preferred address:
-        <User "Bart Person" (2) at ...>
-
     >>> from mailman.utilities.datetime import now
     >>> address = list(bart.user.addresses)[0]
     >>> address.verified_on = now()