aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Handlers/SMTPDirect.py
diff options
context:
space:
mode:
authorbwarsaw <>2005-12-30 18:50:08 +0000
committerbwarsaw <>2005-12-30 18:50:08 +0000
commitd44c2c9f011075a7f6b6ffebe22ec3f17dda3a26 (patch)
tree6199ed049dba0f377f628b9c57a08b1ff9c3f500 /Mailman/Handlers/SMTPDirect.py
parent11ba661517e7606f5f38a8be87f68b32bff0afd4 (diff)
downloadmailman2-d44c2c9f011075a7f6b6ffebe22ec3f17dda3a26.tar.gz
mailman2-d44c2c9f011075a7f6b6ffebe22ec3f17dda3a26.tar.xz
mailman2-d44c2c9f011075a7f6b6ffebe22ec3f17dda3a26.zip
A cleansing pass, almost entirely cosmetic. Such things as whitespace
normalization, removal of tabs, copyright year updates to changed files, docstring and comment fixes, and usage of True/False. I also made a pass through the NEWS file. One import was reordered, and after this commit I will move the mmdsr.readme file to README.mmdsr. From my perspective, after that we're ready to go. I will port these changes forward to the trunk.
Diffstat (limited to '')
-rw-r--r--Mailman/Handlers/SMTPDirect.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/Mailman/Handlers/SMTPDirect.py b/Mailman/Handlers/SMTPDirect.py
index 0d93073d..72b587e9 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