diff --git a/data/Dockerfiles/dovecot/quarantine_notify.py b/data/Dockerfiles/dovecot/quarantine_notify.py index b1af332a..75b3c710 100755 --- a/data/Dockerfiles/dovecot/quarantine_notify.py +++ b/data/Dockerfiles/dovecot/quarantine_notify.py @@ -1,11 +1,11 @@ -#!/usr/bin/python +#!/usr/bin/python3 import smtplib import os import mysql.connector -from email.MIMEMultipart import MIMEMultipart -from email.MIMEText import MIMEText -from email.Utils import COMMASPACE, formatdate +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText +from email.utils import COMMASPACE, formatdate import cgi import jinja2 from jinja2 import Template @@ -20,7 +20,7 @@ while True: r = redis.StrictRedis(host='redis', decode_responses=True, port=6379, db=0) r.ping() except Exception as ex: - print '%s - trying again...' % (ex) + print("{0} - trying again...".format(ex)) time.sleep(3) else: break @@ -32,7 +32,7 @@ def query_mysql(query, headers = True, update = False): try: cnx = mysql.connector.connect(unix_socket = '/var/run/mysqld/mysqld.sock', user='__DBUSER__', passwd='__DBPASS__', database='__DBNAME__', charset="utf8") except Exception as ex: - print '%s - trying again...' % (ex) + print("{0} - trying again...".format(ex)) time.sleep(3) else: break @@ -60,7 +60,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl): try: template = Template(r.get('Q_HTML')) except: - print "Error: Cannot parse quarantine template, falling back to default template." + print("Error: Cannot parse quarantine template, falling back to default template.") with open('/templates/quarantine.tpl') as file_: template = Template(file_.read()) else: @@ -91,7 +91,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl): break except Exception as ex: server.quit() - print '%s' % (ex) + print('{0}'.format(ex)) time.sleep(3) records = query_mysql('SELECT IFNULL(user_acl.quarantine, 0) AS quarantine_acl, count(id) AS counter, rcpt FROM quarantine LEFT OUTER JOIN user_acl ON user_acl.username = rcpt WHERE notified = 0 AND rcpt in (SELECT username FROM mailbox) GROUP BY rcpt') @@ -102,25 +102,25 @@ for record in records: try: last_notification = int(r.hget('Q_LAST_NOTIFIED', record['rcpt'])) if last_notification > time_now: - print 'Last notification is > time now, assuming never' + print('Last notification is > time now, assuming never') last_notification = 0 except Exception as ex: - print 'Could not determine last notification for %s, assuming never' % (record['rcpt']) + print('Could not determine last notification for {0}, assuming never'.format(record['rcpt'])) last_notification = 0 attrs_json = query_mysql('SELECT attributes FROM mailbox WHERE username = "%s"' % (record['rcpt'])) attrs = json.loads(str(attrs_json[0]['attributes'])) if attrs['quarantine_notification'] not in ('hourly', 'daily', 'weekly', 'never'): - print 'Abnormal quarantine_notification value' + print('Abnormal quarantine_notification value') continue if attrs['quarantine_notification'] == 'hourly': if last_notification == 0 or (last_notification + 3600) < time_now: - print "Notifying %s about %d new items in quarantine" % (record['rcpt'], record['counter']) + print("Notifying {0} about {1} new items in quarantine".format(record['rcpt'], record['counter'])) notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl']) elif attrs['quarantine_notification'] == 'daily': if last_notification == 0 or (last_notification + 86400) < time_now: - print "Notifying %s about %d new items in quarantine" % (record['rcpt'], record['counter']) + print("Notifying {0} about {1} new items in quarantine".format(record['rcpt'], record['counter'])) notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl']) elif attrs['quarantine_notification'] == 'weekly': if last_notification == 0 or (last_notification + 604800) < time_now: - print "Notifying %s about %d new items in quarantine" % (record['rcpt'], record['counter']) + print("Notifying {0} about {1} new items in quarantine".format(record['rcpt'], record['counter'])) notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'])