import random
try:
- from email.mime.text import MIMEText
+ from email.mime.nonmultipart import MIMENonMultipart
+ from email.encoders import encode_7or8bit
import email.utils
except ImportError:
# Python 2.4 compatibility
- from email.MIMEText import MIMEText
+ from email.MIMENonMultipart import MIMENonMultipart
+ from email.Encoders import encode_7or8bit
import email.Utils
email.utils = email.Utils
def db_type(self):
return 'char(%d)' % self.n_bytes
+class PatchMbox(MIMENonMultipart):
+ patch_charset = 'utf-8'
+ def __init__(self, _text):
+ MIMENonMultipart.__init__(self, 'text', 'plain',
+ **{'charset': self.patch_charset})
+ self.set_payload(_text.encode(self.patch_charset))
+ encode_7or8bit(self)
+
class Patch(models.Model):
project = models.ForeignKey(Project)
msgid = models.CharField(max_length=255, unique = True)
body = ''
if comment:
- body = comment.content.strip() + "\n\n"
+ body = comment.content.strip() + "\n"
+
+ responses = False
+ for comment in Comment.objects.filter(patch = self) \
+ .exclude(msgid = self.msgid):
+ body += comment.patch_responses()
+
+ if body:
+ body += '\n'
+
body += self.content
- mail = MIMEText(body)
+ mail = PatchMbox(body)
mail['Subject'] = self.name
mail['Date'] = email.utils.formatdate(
time.mktime(self.date.utctimetuple()))
- mail['From'] = str(self.submitter)
+ mail['From'] = unicode(self.submitter)
mail['X-Patchwork-Id'] = str(self.id)
mail.set_unixfrom('From patchwork ' + self.date.ctime())
headers = models.TextField(blank = True)
content = models.TextField()
+ response_re = re.compile('^(Acked|Signed-off|Nacked)-by: .*$', re.M)
+
+ def patch_responses(self):
+ return ''.join([ match.group(0) + '\n' for match in \
+ self.response_re.finditer(self.content)])
+
class Meta:
ordering = ['date']