From f7196564b969c9341025511b48d8f1ec78a0e250 Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 20 Jul 2009 06:24:52 +0000 Subject: [PATCH] fix construction of individual messages to nosy recipents with attachments git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4329 57a73879-2fb5-44c3-a270-3262357dd7e2 --- CHANGES.txt | 2 ++ roundup/roundupdb.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 1b37418..d0b8456 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,8 @@ Fixes: see http://thread.gmane.org/gmane.comp.bug-tracking.roundup.user/9500 - fix problem with bounce-message if incoming mail has insufficient privilege, e.g., user not existing (issue 2550534) +- fix construction of individual messages to nosy recipents with + attachments (issue 2550568) 2009-03-18 1.4.8 (r4209) diff --git a/roundup/roundupdb.py b/roundup/roundupdb.py index 1a9f705..998b290 100644 --- a/roundup/roundupdb.py +++ b/roundup/roundupdb.py @@ -372,7 +372,7 @@ class IssueClass: charset = getattr(self.db.config, 'EMAIL_CHARSET', 'utf-8') # construct the content and convert to unicode object - content = unicode('\n'.join(m), 'utf-8').encode(charset) + body = unicode('\n'.join(m), 'utf-8').encode(charset) # make sure the To line is always the same (for testing mostly) sendto.sort() @@ -459,7 +459,7 @@ class IssueClass: # attach files if message_files: # first up the text as a part - part = MIMEText(content) + part = MIMEText(body) encode_quopri(part) message.attach(part) @@ -494,7 +494,7 @@ class IssueClass: message.attach(part) else: - message.set_payload(content) + message.set_payload(body) encode_quopri(message) if first: -- 2.30.2