Yet another rfc2822 encoding patch: '?' must be escaped.

Fixes [SF#1505663] "'?' in rfc2822-encoded header isn't quoted +patch"

Author: Ralf Schlatterbeck

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 not in '_=':
+        elif hqre.match(c) and c not in '_=?':
             quoted += c
         # Otherwise, replace with hex value like =E2
         else:

test/test_rfc2822.py

@@ -21,6 +21,10 @@ def testEncode(self):
         result = '=?utf-8?q?Re:_[it=5Fissue3]_Ren=C3=A9s_[status=3Dfeedback]?='
         self.assertEqual(encode_header(src), result)
 
+        src = 'Was machen\xc3\xbc und Fragezeichen?'
+        result = '=?utf-8?q?Was_machen=C3=BC_und_Fragezeichen=3F?='
+        self.assertEqual(encode_header(src), result)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(RFC2822TestCase))