X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=modules%2Fmailer.py;h=f03ec6af6cfb02bfadaeea4366f921f0ff754c4f;hb=c98964cc2c14c4ed4213b4283edf5e3f07c0d3ab;hp=bf13ef5e551ebf9b51b31ac2f52d49af435efdcc;hpb=72b522a24f2dcde856f1d66b34476aebe13ec4fc;p=tld-ftp-admin.git diff --git a/modules/mailer.py b/modules/mailer.py index bf13ef5..f03ec6a 100644 --- a/modules/mailer.py +++ b/modules/mailer.py @@ -3,7 +3,10 @@ import time import os import sys -import StringIO +if sys.version_info[0] == 2: + import StringIO +else: + import io as StringIO import config cval=config.value @@ -39,10 +42,10 @@ class Message: def __set_std_headers(self): self.headers["Date"] = time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) - self.headers["Message-ID"] = "" \ + self.headers["Message-ID"] = "" \ % (time.time(), os.getpid(), os.uname()[1]) self.headers["From"] = cval['from_field'] - self.headers["X-PLD-Builder"] = cval['xpldbuilder'] + self.headers["X-TLD-Builder"] = cval['xtldbuilder'] def __write_to(self, f): for k, v in self.headers.items():