X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Fmailer.py;h=7725a60710f76576f3fff2b1022c2b0004c1a012;hb=b06ac0a74084c2ed513ecead310ea47208344d14;hp=5ccf63a0d3c00628ee6c974e8291aa0541a1dff5;hpb=92949e17161a53bfb4a60099e22b58ad63abce4c;p=tld-builder.git diff --git a/TLD_Builder/mailer.py b/TLD_Builder/mailer.py index 5ccf63a..7725a60 100644 --- a/TLD_Builder/mailer.py +++ b/TLD_Builder/mailer.py @@ -14,14 +14,14 @@ import log def recode(s): if s.__class__ == ''.__class__: - return s.decode('iso-8859-1', 'replace').encode('us-ascii', 'replace') + return s.encode('iso-8859-1', 'replace').decode('us-ascii', 'replace') else: - return s.encode('us-ascii', 'replace') + return s.decode('us-ascii', 'replace') class Message: def __init__(self): self.headers = {} - self.body = StringIO.StringIO() + self.body = StringIO() self.set_std_headers() def set_header(self, n, v):