Port cleaning changes forward from 2.1-maint branch.

1 files changed, 7 insertions, 6 deletions

diff --git a/Mailman/Handlers/SMTPDirect.py b/Mailman/Handlers/SMTPDirect.py
index 0d93073d2..72b587e98 100644
--- a/Mailman/Handlers/SMTPDirect.py
+++ b/Mailman/Handlers/SMTPDirect.py
@@ -12,7 +12,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Local SMTP direct drop-off.
 
@@ -135,11 +136,11 @@ def process(mlist, msg, msgdata):
     t0 = time.time()
     # Open the initial connection
     origrecips = msgdata['recips']
-    # MAS: get the message sender now for logging. If we're using 'sender'
-    # and not 'from', bulkdeliver changes it for bounce processing.
-    # If we're VERPing, it doesn't matter because bulkdeliver is working
-    # on a copy, but otherwise msg gets changed. If the list is anonymous,
-    # the original sender is long gone, but Cleanse.py has logged it.
+    # MAS: get the message sender now for logging.  If we're using 'sender'
+    # and not 'from', bulkdeliver changes it for bounce processing.  If we're
+    # VERPing, it doesn't matter because bulkdeliver is working on a copy, but
+    # otherwise msg gets changed.  If the list is anonymous, the original
+    # sender is long gone, but Cleanse.py has logged it.
     origsender = msgdata.get('original_sender', msg.get_sender())
     # `undelivered' is a copy of chunks that we pop from to do deliveries.
     # This seems like a good tradeoff between robustness and resource