Several important cleanups.

* Turn on absolute_import and unicode_literals everywhere, and deal with the
  aftermath.
* Use 'except X as Y' everywhere.
* Make the module prologues much more consistent.
* Use '{}'.format() consistently, except for logger interface.
* Because of the problems with calling ** args with unicode keywords, hide
  calls to Template.substitute() behind an API.

4 files changed, 44 insertions, 45 deletions

diff --git a/mailman/pipeline/docs/archives.txt b/mailman/pipeline/docs/archives.txt
index d81f6e27b..d90228525 100644
--- a/mailman/pipeline/docs/archives.txt
+++ b/mailman/pipeline/docs/archives.txt
@@ -105,8 +105,9 @@ But if the value is 'yes', then the message will be archived.
     <BLANKLINE>
     A message of great import.
     <BLANKLINE>
-    >>> sorted(qdata.items())
-    [('_parsemsg', False), ('received_time', ...), ('version', 3)]
+    >>> dump_msgdata(qdata)
+    _parsemsg: False
+    version  : 3
 
 Without either archiving header, and all other things being the same, the
 message will get archived.
@@ -127,5 +128,6 @@ message will get archived.
     <BLANKLINE>
     A message of great import.
     <BLANKLINE>
-    >>> sorted(qdata.items())
-    [('_parsemsg', False), ('received_time', ...), ('version', 3)]
+    >>> dump_msgdata(qdata)
+    _parsemsg: False
+    version  : 3
diff --git a/mailman/pipeline/docs/digests.txt b/mailman/pipeline/docs/digests.txt
index e94f9912f..cb939f7ca 100644
--- a/mailman/pipeline/docs/digests.txt
+++ b/mailman/pipeline/docs/digests.txt
@@ -254,12 +254,14 @@ digest and an RFC 1153 plain text digest.  The size threshold is in KB.
     <BLANKLINE>
     --...
     --...
-    >>> sorted(mimedata.items())
-    [('_parsemsg', False),
-     ('isdigest', True),
-     ('listname', u'_xtest@example.com'),
-     ('received_time', ...),
-     ('recips', set([])), ('version', 3)]
+    >>> dump_msgdata(mimedata)
+    _parsemsg: False
+    isdigest : True
+    listname : _xtest@example.com
+    recips   : set([])
+    version  : 3
+
+
     >>> print rfc1153msg.as_string()
     From: _xtest-request@example.com
     Subject: XTest Digest, Vol 2, Issue 10
@@ -389,12 +391,12 @@ digest and an RFC 1153 plain text digest.  The size threshold is in KB.
     End of XTest Digest, Vol 2, Issue 10
     ************************************
     <BLANKLINE>
-    >>> sorted(rfc1153data.items())
-    [('_parsemsg', False),
-     ('isdigest', True),
-     ('listname', u'_xtest@example.com'),
-     ('received_time', ...),
-     ('recips', set([])), ('version', 3)]
+    >>> dump_msgdata(rfc1153data)
+    _parsemsg: False
+    isdigest : True
+    listname : _xtest@example.com
+    recips   : set([])
+    version  : 3
 
 
 Internationalized digests
@@ -505,12 +507,13 @@ Set the digest threshold to zero so that the digests will be sent immediately.
     <BLANKLINE>
     --...
     --...
-    >>> sorted(mimedata.items())
-    [('_parsemsg', False),
-     ('isdigest', True),
-     ('listname', u'_xtest@example.com'),
-     ('received_time', ...),
-     ('recips', set([])), ('version', 3)]
+    >>> dump_msgdata(mimedata)
+    _parsemsg: False
+    isdigest : True
+    listname : _xtest@example.com
+    recips   : set([])
+    version  : 3
+
     >>> print rfc1153msg.as_string()
     From: _xtest-request@example.com
     Subject: Groupe XTest, Vol. 2, Parution 11
@@ -524,15 +527,9 @@ Set the digest threshold to zero so that the digests will be sent immediately.
     <BLANKLINE>
     ...
     <BLANKLINE>
-    >>> sorted(rfc1153data.items())
-    [('_parsemsg', False),
-     ('isdigest', True),
-     ('listname', u'_xtest@example.com'),
-     ('received_time', ...),
-     ('recips', set([])), ('version', 3)]
-
-
-Clean up
---------
-
-    >>> config.DEFAULT_SERVER_LANGUAGE = u'en'
+    >>> dump_msgdata(rfc1153data)
+    _parsemsg: False
+    isdigest : True
+    listname : _xtest@example.com
+    recips   : set([])
+    version  : 3
diff --git a/mailman/pipeline/docs/nntp.txt b/mailman/pipeline/docs/nntp.txt
index 0120de394..3f48be1da 100644
--- a/mailman/pipeline/docs/nntp.txt
+++ b/mailman/pipeline/docs/nntp.txt
@@ -59,8 +59,7 @@ messages are gated to.
     <BLANKLINE>
     Something of great import.
     <BLANKLINE>
-    >>> sorted(msgdata.items())
-    [('_parsemsg', False),
-     ('listname', u'_xtest@example.com'),
-     ('received_time', ...),
-     ('version', 3)]
+    >>> dump_msgdata(msgdata)
+    _parsemsg: False
+    listname : _xtest@example.com
+    version  : 3
diff --git a/mailman/pipeline/docs/to-outgoing.txt b/mailman/pipeline/docs/to-outgoing.txt
index 6142d86c7..5305db19f 100644
--- a/mailman/pipeline/docs/to-outgoing.txt
+++ b/mailman/pipeline/docs/to-outgoing.txt
@@ -51,12 +51,13 @@ additional key set: the mailing list name.
     Subject: Here is a message
     <BLANKLINE>
     Something of great import.
-    >>> sorted(qmsgdata.items())    
-    [('_parsemsg', False),
-     ('bar', 2), ('foo', 1),
-     ('listname', u'_xtest@example.com'),
-     ('received_time', ...),
-     ('verp', True), ('version', 3)]
+    >>> dump_msgdata(qmsgdata)
+    _parsemsg: False
+    bar      : 2
+    foo      : 1
+    listname : _xtest@example.com
+    verp     : True
+    version  : 3
     >>> queue_size()
     0