7 files changed, 21 insertions, 22 deletions

diff --git a/src/mailman/commands/docs/echo.rst b/src/mailman/commands/docs/echo.rst
index 686accf2c..6412a4afe 100644
--- a/src/mailman/commands/docs/echo.rst
+++ b/src/mailman/commands/docs/echo.rst
@@ -24,7 +24,7 @@ The original message is ignored, but the results receive the echoed command.
     >>> from mailman.email.message import Message
     >>> print(command.process(mlist, Message(), {}, ('foo', 'bar'), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(str(results))
     The results of your email command are provided below.
     <BLANKLINE>
     echo foo bar
diff --git a/src/mailman/commands/docs/help.rst b/src/mailman/commands/docs/help.rst
index 35ba87caa..5330a0b79 100644
--- a/src/mailman/commands/docs/help.rst
+++ b/src/mailman/commands/docs/help.rst
@@ -25,7 +25,7 @@ short description of each of them.
     >>> from mailman.email.message import Message
     >>> print(help.process(mlist, Message(), {}, (), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     confirm     - Confirm a subscription request.
@@ -44,7 +44,7 @@ With an argument, you can get more detailed help about a specific command.
     >>> results = Results()
     >>> print(help.process(mlist, Message(), {}, ('help',), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     help [command]
@@ -56,7 +56,7 @@ Some commands have even more detailed help.
     >>> results = Results()
     >>> print(help.process(mlist, Message(), {}, ('join',), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     join [digest=<no|mime|plain>]
diff --git a/src/mailman/commands/docs/inject.rst b/src/mailman/commands/docs/inject.rst
index 63e7b0366..16cf81661 100644
--- a/src/mailman/commands/docs/inject.rst
+++ b/src/mailman/commands/docs/inject.rst
@@ -133,7 +133,7 @@ Standard input
 The message text can also be provided on standard input.
 ::
 
-    >>> from StringIO import StringIO
+    >>> from six import StringIO
 
     # Remember: we've got unicode literals turned on.
     >>> standard_in = StringIO(str("""\
diff --git a/src/mailman/commands/docs/members.rst b/src/mailman/commands/docs/members.rst
index 7b99e92f9..5ec1521a5 100644
--- a/src/mailman/commands/docs/members.rst
+++ b/src/mailman/commands/docs/members.rst
@@ -229,9 +229,8 @@ You can also specify ``-`` as the filename, in which case the addresses are
 taken from standard input.
 ::
 
-    >>> from StringIO import StringIO
+    >>> from six import StringIO
     >>> fp = StringIO()
-    >>> fp.encoding = 'us-ascii'
     >>> for address in ('dperson@example.com',
     ...                 'Elly Person <eperson@example.com>',
     ...                 'fperson@example.com (Fred Person)',
diff --git a/src/mailman/commands/docs/membership.rst b/src/mailman/commands/docs/membership.rst
index 3fe9b05ba..a260e930a 100644
--- a/src/mailman/commands/docs/membership.rst
+++ b/src/mailman/commands/docs/membership.rst
@@ -45,7 +45,7 @@ If that's missing though, then an error is returned.
     >>> from mailman.email.message import Message
     >>> print(join.process(mlist, Message(), {}, (), results))
     ContinueProcessing.no
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     join: No valid address found to subscribe
@@ -60,7 +60,7 @@ The ``subscribe`` command is an alias.
     >>> results = Results()
     >>> print(subscribe.process(mlist, Message(), {}, (), results))
     ContinueProcessing.no
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     subscribe: No valid address found to subscribe
@@ -79,7 +79,7 @@ When the message has a From field, that address will be subscribed.
     >>> results = Results()
     >>> print(join.process(mlist, msg, {}, (), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     Confirmation email sent to Anne Person <anne@example.com>
@@ -150,7 +150,7 @@ list.
     >>> results = Results()
     >>> print(confirm.process(mlist, msg, {}, (token,), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     Confirmed
@@ -208,7 +208,7 @@ list.
     >>> results = Results()
     >>> print(confirm.process(mlist_2, msg, {}, (token,), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     Confirmed
@@ -241,7 +241,7 @@ is sent a confirmation message for her request.
     >>> results = Results()
     >>> print(leave.process(mlist_2, msg, {}, (), results))
     ContinueProcessing.yes
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     Anne Person <anne@example.com> left baker@example.com
@@ -278,7 +278,7 @@ to unsubscribe Anne from the alpha mailing list.
     >>> print(leave.process(mlist, msg, {}, (), results))
     ContinueProcessing.no
 
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     Invalid or unverified email address: anne.person@example.org
@@ -299,7 +299,7 @@ unsubscribe her from the list.
     >>> print(leave.process(mlist, msg, {}, (), results))
     ContinueProcessing.yes
 
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     Anne Person <anne.person@example.org> left alpha@example.com
@@ -354,7 +354,7 @@ a user of the system.
     >>> print(confirm.process(mlist, msg, {}, (token,), results))
     ContinueProcessing.yes
 
-    >>> print(results.decode('utf-8'))
+    >>> print(results)
     The results of your email command are provided below.
     <BLANKLINE>
     Confirmed
diff --git a/src/mailman/commands/docs/qfile.rst b/src/mailman/commands/docs/qfile.rst
index 8ec0a3952..721d63567 100644
--- a/src/mailman/commands/docs/qfile.rst
+++ b/src/mailman/commands/docs/qfile.rst
@@ -55,11 +55,11 @@ Once we've figured out the file name of the shunted message, we can print it.
     I borkeded Mailman.
     <BLANKLINE>
     <----- start object 2 ----->
-    {   u'_parsemsg': False,
-        'bad': u'yes',
-        'bar': u'baz',
+    {   '_parsemsg': False,
+        'bad': 'yes',
+        'bar': 'baz',
         'foo': 7,
-        u'version': 3}
+        'version': 3}
     [----- end pickle -----]
 
 Maybe we don't want to print the contents of the file though, in case we want
diff --git a/src/mailman/commands/docs/withlist.rst b/src/mailman/commands/docs/withlist.rst
index e915eb04c..321b6e68a 100644
--- a/src/mailman/commands/docs/withlist.rst
+++ b/src/mailman/commands/docs/withlist.rst
@@ -52,10 +52,10 @@ single argument, the mailing list.
     >>> with open(os.path.join(config.VAR_DIR, 'showme.py'), 'w') as fp:
     ...     print("""\
     ... def showme(mailing_list):
-    ...     print "The list's name is", mailing_list.fqdn_listname
+    ...     print("The list's name is", mailing_list.fqdn_listname)
     ...
     ... def displayname(mailing_list):
-    ...     print "The list's display name is", mailing_list.display_name
+    ...     print("The list's display name is", mailing_list.display_name)
     ... """, file=fp)
 
 If the name of the function is the same as the module, then you only need to