Checkpointing.

By using `six` I think I have most of the imports squared away.  There's
probably still uses of `unicode` built-ins that need fixing.

The idea is to first get the test suite running (which it doesn't yet), and
then to fix tests.

There's a bug in lazr.config which requires us to patch it for now.

3 files changed, 14 insertions, 14 deletions

diff --git a/src/mailman/commands/docs/echo.rst b/src/mailman/commands/docs/echo.rst
index 32399ebfc..686accf2c 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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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 bbd6c8c09..35ba87caa 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(unicode(results))
+    >>> print(results.decode('utf-8'))
     The results of your email command are provided below.
     <BLANKLINE>
     confirm     - Confirm a subscription request.
@@ -44,19 +44,19 @@ 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(unicode(results))
+    >>> print(results.decode('utf-8'))
     The results of your email command are provided below.
     <BLANKLINE>
     help [command]
     Get help about available email commands.
     <BLANKLINE>
-    
+
 Some commands have even more detailed help.
 
     >>> results = Results()
     >>> print(help.process(mlist, Message(), {}, ('join',), results))
     ContinueProcessing.yes
-    >>> print(unicode(results))
+    >>> print(results.decode('utf-8'))
     The results of your email command are provided below.
     <BLANKLINE>
     join [digest=<no|mime|plain>]
diff --git a/src/mailman/commands/docs/membership.rst b/src/mailman/commands/docs/membership.rst
index aa3ab97e6..3fe9b05ba 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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     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(unicode(results))
+    >>> print(results.decode('utf-8'))
     The results of your email command are provided below.
     <BLANKLINE>
     Confirmed