From 2c954887453ed48f85e4318108475a382226c084 Mon Sep 17 00:00:00 2001
From: Mark Sapiro
Date: Thu, 15 Mar 2012 18:54:32 -0700
Subject: Fixed a unicode decode error on messages with non-ascii text/plain
 parts.

---
 src/mailman/rules/approved.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mailman/rules/approved.py b/src/mailman/rules/approved.py
index 8981f9030..b2a04bb05 100644
--- a/src/mailman/rules/approved.py
+++ b/src/mailman/rules/approved.py
@@ -73,10 +73,12 @@ class Approved:
                 break
             payload = part.get_payload(decode=True)
             if payload is not None:
+                cset = part.get_content_charset() or 'us-ascii'
+                payload = payload.decode(cset, 'replace')
                 line = ''
                 lines = payload.splitlines(True)
                 for lineno, line in enumerate(lines):
-                    if line.strip() <> '':
+                    if line.strip() != '':
                         break
                 if ':' in line:
                     header, value = line.split(':', 1)
-- 
cgit v1.2.3-70-g09d2