if part.get_content_maintype() != 'text':
continue
- #print "\t%s, %s" % \
- # (part.get_content_subtype(), part.get_content_charset())
-
- charset = part.get_content_charset()
- if not charset:
- charset = mail.get_charset()
- if not charset:
- charset = 'utf-8'
-
- payload = unicode(part.get_payload(decode=True), charset, "replace")
+ payload = part.get_payload(decode=True)
if part.get_content_subtype() == 'x-patch':
patchbuf = payload
email.attach(attachment)
(self.patch, self.comment) = find_content(self.project, email)
+class UTF8InlinePatchTest(InlinePatchTest):
+ patch_filename = '0002-utf-8.patch'
+ patch_encoding = 'utf-8'
+
+ def setUp(self):
+ self.orig_patch = read_patch(self.patch_filename, self.patch_encoding)
+ email = create_email(self.test_comment + '\n' + self.orig_patch,
+ content_encoding = self.patch_encoding)
+ (self.patch, self.comment) = find_content(self.project, email)
class SignatureCommentTest(InlinePatchTest):
patch_filename = '0001-add-line.patch'
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
-from patchwork.models import Project
+import codecs
+from patchwork.models import Project, Person
try:
from email.mime.text import MIMEText
from email.mime.multipart import MIMEMultipart
project = Project(linkname = 'test-project', name = 'Test Project')
patch_author = 'Patch Author <patch-author@example.com>'
+ patch_author_person = Person(name = 'Patch Author',
+ email = 'patch-author@example.com')
comment_author = 'Comment Author <comment-author@example.com>'
patch_name = 'Test Patch'
-def read_patch(filename):
- return file(os.path.join(_test_patch_dir, filename)).read()
+def read_patch(filename, encoding = None):
+ file_path = os.path.join(_test_patch_dir, filename)
+ if encoding is not None:
+ f = codecs.open(file_path, encoding = encoding)
+ else:
+ f = file(file_path)
+
+ return f.read()
def create_email(content, subject = None, sender = None, multipart = False,
- project = None):
+ project = None, content_encoding = None):
if subject is None:
subject = defaults.subject
if sender is None:
if multipart:
msg = MIMEMultipart()
body = MIMEText(content, _subtype = 'plain')
+ if content_encoding is not None:
+ body.set_charset(content_encoding)
msg.attach(body)
else:
msg = MIMEText(content)
+ if content_encoding is not None:
+ msg.set_charset(content_encoding)
msg['Subject'] = subject
msg['From'] = sender
msg['List-Id'] = project.linkname
+
return msg