- drop util.sendfile, use shutil.copyfileobj instead

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

diff --git a/TLD_Builder/mailer.py b/TLD_Builder/mailer.py
index a0e1bb568d69a9250057837f2b62b6f335891ae7..764bdf416d8845ad3e15fcb99a77339817f8a0e4 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 shutil
 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):
@@ -62,7 +58,7 @@ class Message:
                     self.body.write("\n\n[...]\n\n")
                 line += 1
         else:
-            util.sendfile(open(log), self.body)
+            shutil.copyfileobj(open(log), self.body)
 
     def set_std_headers(self):
         self.headers["Date"] = time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())
@@ -77,7 +73,7 @@ class Message:
             f.write("%s: %s\n" % (k, v))
         f.write("\n")
         self.body.seek(0)
-        util.sendfile(self.body, f)
+        shutil.copyfileobj(self.body, f)
 
     def send(self):
         if not os.path.exists("/usr/lib/sendmail"):