Changeset 404

Timestamp:

Jun 3, 2020, 10:17:18 AM (4 years ago)

Author:

Rick van der Zwet

Message:

foomailer: Convert to python3

File:

• foomailer/foomail.py (modified) (8 diffs)

foomailer/foomail.py

@@ -8 +8 @@
 import time
 from time import gmtime,strftime
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEBase import MIMEBase
-from email.MIMEText import MIMEText
-from email.Utils import COMMASPACE, formatdate
-from email import Encoders
+from email.mime.multipart import MIMEMultipart
+from email.mime.base import MIMEBase
+from email.mime.text import MIMEText
+from email.utils import COMMASPACE, formatdate
+from email import encoders
 
 __svnversion__ = "$Id: foomail.py 633 2008-06-12 19:29:56Z rick $"
@@ -19 +19 @@
 
 def usage():
-    print "usage %s -f <from> -r <recipient> -s <server> [--spam]" % sys.argv[0]
-    print "[--virus] [--file <size in kB>] [--message <file>]"
-    print "[--subject <string>] [--to <string>] [--cc <string>]"
-    print "[--force]"
+    print("usage %s -f <from> -r <recipient> -s <server> [--spam]" % sys.argv[0])
+    print("[--virus] [--file <size in kB>] [--message <file>]")
+    print("[--subject <string>] [--to <string>] [--cc <string>]")
+    print("[--force]")
 
 default_domain = 'example.com'
@@ -91 +91 @@
 error = False
 if not sender:
-    print "No sender defined"
+    print("No sender defined")
     error = True
 elif not recipient:
-    print "No recipient defined"
+    print("No recipient defined")
     error = True
 elif not server:
-    print "No server defined"
+    print("No server defined")
     error = True
 
@@ -128 +128 @@
 email['X-Port'] = port
 email['X-Hostname'] = hostname
-email['Message-ID' ] = '<' +''.join(random.sample(string.letters +
+email['Message-ID' ] = '<' +''.join(random.sample(string.ascii_letters +
                        string.digits,10)) + '@' + email['X-Hostname'] + '>'
 email['Date'] = strftime('%a, %d %b %Y %T %z',gmtime())
@@ -156 +156 @@
 Technical details:\n''' % email
     
-    for k in email.keys():
+    for k in list(email.keys()):
         v = email[k]
         msg += "* %-15s : %s\n" % (k,v)
@@ -183 +183 @@
     part = MIMEBase('application', "octet-stream")
     part.set_payload('X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*')
-    Encoders.encode_base64(part)
+    encoders.encode_base64(part)
     part.add_header('Content-Disposition', 'attachment; filename="eicar.txt"')
     email.attach(part)
@@ -194 +194 @@
         part.set_payload(f.read())
         f.close()
-        Encoders.encode_base64(part)
+        encoders.encode_base64(part)
         part.add_header('Content-Disposition', 'attachment; filename="%s"' % os.path.basename(file))
         email.attach(part)
 
-print email.as_string()
+print(email.as_string())
 
 if not dry:
@@ -208 +208 @@
     server.sendmail(sender, recipient, email.as_string())
     server.quit()
-    print "Sending took sec: %.2f" % (time.time() - mark)
+    print("Sending took sec: %.2f" % (time.time() - mark))