------------------------------------------------------------
revno: 984
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2007-06-29 14:24:32 -0700
message:
There is a bug in email 2.5.8 and possibly others, but not in 4.0.1 or
4.0.2 that causes email.Utils.getaddresses() to return a spurious (name,
address) tuple if the supplied argument is multi-line. The actual bug is
in email.Utils.parseaddr(), but the manifestation in Message.py is in
the use of getaddresses() in get_sender() and get_senders().
This fix works around the bug by passing the header field values through
Mailman.Utils.oneline().
modified:
Mailman/Message.py
=== modified file 'Mailman/Message.py'
--- a/Mailman/Message.py 2006-03-06 18:21:52 +0000
+++ b/Mailman/Message.py 2007-06-29 21:24:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -127,6 +127,10 @@
fieldval = self[h]
if not fieldval:
continue
+ # Work around bug in email 2.5.8 (and ?) involving getaddresses()
+ # from multi-line header values. Note that cset='us-ascii' is OK
+ # since the address itself can't be RFC 2047 encoded.
+ fieldval = Utils.oneline(fieldval, 'us-ascii')
addrs = email.Utils.getaddresses([fieldval])
try:
realname, address = addrs[0]
@@ -180,6 +184,10 @@
else:
fieldvals = self.get_all(h)
if fieldvals:
+ # See comment above in get_sender() regarding
+ # getaddresses() and multi-line headers
+ fieldvals = [Utils.oneline(fv, 'us-ascii')
+ for fv in fieldvals]
pairs.extend(email.Utils.getaddresses(fieldvals))
authors = []
for pair in pairs:
--
(no title)
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+subscription/mailman-checkins.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
