- more python3 fixes, dropped python2 support

[tld-builder.git] / TLD_Builder / mailer.py

diff --git a/TLD_Builder/mailer.py b/TLD_Builder/mailer.py
index a0e1bb568d69a9250057837f2b62b6f335891ae7..f76a8bda289957ad214e462951fb4a844f3ec463 100644 (file)
--- 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):