X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Fmailer.py;h=f76a8bda289957ad214e462951fb4a844f3ec463;hb=9ea122b00e3a99b16246e1e38576916a2e25c0aa;hp=a0e1bb568d69a9250057837f2b62b6f335891ae7;hpb=3a6296fff210d498302ce0a2da6beed689466347;p=tld-builder.git

diff --git a/TLD_Builder/mailer.py b/TLD_Builder/mailer.py
index a0e1bb5..f76a8bd 100644
--- a/TLD_Builder/mailer.py
+++ b/TLD_Builder/mailer.py
@@ -3,20 +3,16 @@
 import time
 import os
 import sys
-if sys.version_info[0] == 2:
-    import StringIO
-else:
-    from io import StringIO
-
+from io import StringIO
 from config import config
 import util
 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):