additional header encode/decode fixes

Author: Richard Jones

roundup/rfc2822.py

@@ -141,7 +141,7 @@ def encode_header(header, charset='utf-8'):
         if c == ' ':
             quoted += '_'
         # These characters can be included verbatim
-        elif hqre.match(c) and c != '_':
+        elif hqre.match(c) and c not in '_=':
             quoted += c
         # Otherwise, replace with hex value like =E2
         else:

test/test_rfc2822.py

@@ -0,0 +1,27 @@
+from roundup.rfc2822 import decode_header, encode_header
+
+import unittest, time
+ 
+class RFC2822TestCase(unittest.TestCase):
+    def testDecode(self):
+        src = 'Re: [it_issue3] '\
+            '=?ISO-8859-1?Q?Ren=E9s_[resp=3Dg=2Cstatus=3D?= '\
+            '=?ISO-8859-1?Q?feedback]?='
+        result = 'Re: [it_issue3] Ren\xc3\xa9s [resp=g,status=feedback]'
+        self.assertEqual(decode_header(src), result)
+
+        src = 'Re: [it_issue3]'\
+            ' =?ISO-8859-1?Q?Ren=E9s_[resp=3Dg=2Cstatus=3D?=' \
+            ' =?ISO-8859-1?Q?feedback]?='
+        result = 'Re: [it_issue3] Ren\xc3\xa9s [resp=g,status=feedback]'
+        self.assertEqual(decode_header(src), result)
+
+    def testEncode(self):
+        src = 'Re: [it_issue3] Ren\xc3\xa9s [status=feedback]'
+        result = '=?utf-8?q?Re:_[it=5Fissue3]_Ren=C3=A9s_[status=3Dfeedback]?='
+        self.assertEqual(encode_header(src), result)
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(RFC2822TestCase))
+    return suite