--- /usr/share/rss2email/rss2email.py 2005-08-03 21:02:15.000000000 +0300 +++ mysrc/rss2email/rss2email.py 2005-08-07 19:10:37.127765024 +0300 @@ -107,6 +107,7 @@ for e in ['error', 'gaierror']: if hasattr(socket, e): socket_errors.append(getattr(socket, e)) import mimify; from StringIO import StringIO as SIO; mimify.CHARSET = 'utf-8' +from email.Header import Header if SMTP_SEND: import smtplib; smtpserver = smtplib.SMTP(SMTP_SERVER) else: smtpserver = None @@ -139,9 +140,11 @@ """QP_CORRUPT headers.""" #return mimify.mime_encode_header(s + ' ')[:-1] # XXX due to mime_encode_header bug - import re - p = re.compile('=\n([^ \t])'); - return p.sub(r'\1', mimify.mime_encode_header(s + ' ')[:-1]) +# import re +# p = re.compile('=\n([^ \t])'); +# return p.sub(r'\1', mimify.mime_encode_header(s + ' ')[:-1]) + h = Header(s, 'utf-8', 50) + return h.encode() ### Parsing Utilities ###