Article.__init__(): Use the Reply-To: address as the self.email only

as a last resort, if no valid email address could be retrieved from
the From: line.  Previously it would always defer to the Reply-To:
address with unintended side effects.

Closes SF bug #224274.

1 files changed, 6 insertions, 4 deletions

diff --git a/Mailman/Archiver/pipermail.py b/Mailman/Archiver/pipermail.py
index b3195a800..2f1306e7a 100644
--- a/Mailman/Archiver/pipermail.py
+++ b/Mailman/Archiver/pipermail.py
@@ -168,15 +168,17 @@ class Article:
 
         self._set_date(message)
 
-	# Figure out the e-mail address and poster's name
+	# Figure out the e-mail address and poster's name.  Use the From:
+	# field first, followed by Reply-To:
 	self.author, self.email = email.Utils.parseaddr(message['From'])
 	e = message['Reply-To']
-	if e is not None:
-            self.email = e
+	if not self.email and e is not None:
+            ignoreauthor, self.email = email.Utils.parseaddr(e)
 	self.email = strip_separators(self.email)
 	self.author = strip_separators(self.author)
 
-	if self.author == "": self.author = self.email
+	if self.author == "":
+            self.author = self.email
 
 	# Save the In-Reply-To:, References:, and Message-ID: lines
         #