try:
from email.mime.nonmultipart import MIMENonMultipart
from email.encoders import encode_7or8bit
+ from email.parser import HeaderParser
import email.utils
except ImportError:
# Python 2.4 compatibility
if postscript:
body += '---\n' + postscript.strip() + '\n'
- body += self.content
+ body += '\n' + self.content
mail = PatchMbox(body)
mail['Subject'] = self.name
time.mktime(self.date.utctimetuple()))
mail['From'] = unicode(self.submitter)
mail['X-Patchwork-Id'] = str(self.id)
+ mail['Message-Id'] = self.msgid
mail.set_unixfrom('From patchwork ' + self.date.ctime())
- return mail
+ copied_headers = ['To', 'Cc']
+ orig_headers = HeaderParser().parsestr(str(self.headers))
+ for header in copied_headers:
+ if header in orig_headers:
+ mail[header] = orig_headers[header]
+
+ return mail
@models.permalink
def get_absolute_url(self):
headers = models.TextField(blank = True)
content = models.TextField()
- response_re = re.compile('^(Acked|Signed-off|Nacked)-by: .*$', re.M)
+ response_re = re.compile( \
+ '^(Tested|Reviewed|Acked|Signed-off|Nacked|Reported)-by: .*$',
+ re.M | re.I)
def patch_responses(self):
return ''.join([ match.group(0) + '\n' for match in \
def mbox(self):
return '\n'.join([p.mbox().as_string(True) \
- for p in self.patches.all()])
+ for p in self.ordered_patches()])
class BundlePatch(models.Model):
patch = models.ForeignKey(Patch)