For from_is_list feature, use email address from original From: if

original From: has no display name and strip domain part from resultant
names that look like email addresses.  (LP: #1304511)

2 files changed, 6 insertions, 0 deletions

diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 1333e650..f0a2fc47 100755
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -123,6 +123,8 @@ def process(mlist, msg, msgdata):
         realname, email = parseaddr(msg['from'])
         if not realname:
             realname = email
+        # Remove domain from realname if it looks like an email address
+        realname = re.sub(r'@([^ .]+\.)+[^ .]+$', '---', realname)
         replies = getaddresses(msg.get('reply-to', ''))
         reply_addrs = [x[1].lower() for x in replies]
         if reply_addrs:
diff --git a/NEWS b/NEWS
index 263ed723..3e27f993 100755
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ Here is a history of user visible changes to Mailman.
 
   Bug Fixes and other patches
 
+    - For from_is_list feature, use email address from original From: if
+      original From: has no display name and strip domain part from resultant
+      names that look like email addresses.  (LP: #1304511)
+
     - Added the list name to the vette log "held message approved" entry.
       (LP: 1295875)