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.

1 files changed, 4 insertions, 4 deletions

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>]