From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 06:52:39 +0000 (-0000)
Subject: Bug #263370 - In create_message(), use email.header.Header to wrap the
X-Git-Tag: v2.1.6.12~133
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8cb658ccf7776d622b7f63c72337b0897ad0d1be;p=portage.git

Bug #263370 - In create_message(), use email.header.Header to wrap the
subject, as a workaround so that long subject lines are wrapped correctly
by <=python-2.6 (gentoo bug #263370, python issue #1974). (trunk r13261)

svn path=/main/branches/2.1.6/; revision=13440
---

diff --git a/pym/portage/mail.py b/pym/portage/mail.py
index 72b411264..5f1cc11a6 100644
--- a/pym/portage/mail.py
+++ b/pym/portage/mail.py
@@ -7,6 +7,7 @@ import portage.exception, socket, smtplib, os, sys, time
 from email.MIMEText import MIMEText as TextMessage
 from email.MIMEMultipart import MIMEMultipart as MultipartMessage
 from email.MIMEBase import MIMEBase as BaseMessage
+from email.header import Header
 
 def create_message(sender, recipient, subject, body, attachments=None):
 	if attachments == None:
@@ -25,7 +26,9 @@ def create_message(sender, recipient, subject, body, attachments=None):
 	mymessage.set_unixfrom(sender)
 	mymessage["To"] = recipient
 	mymessage["From"] = sender
-	mymessage["Subject"] = subject
+	# Use Header as a workaround so that long subject lines are wrapped
+	# correctly by <=python-2.6 (gentoo bug #263370, python issue #1974).
+	mymessage["Subject"] = Header(subject)
 	mymessage["Date"] = time.strftime("%a, %d %b %Y %H:%M:%S %z")
 	
 	return mymessage