From 4aae447e97600fb1e74057c596467d6a07adc633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Wed, 28 Aug 2019 07:01:47 +0200 Subject: [PATCH] Revert "Python27 eol issue2291" --- data/Dockerfiles/dovecot/Dockerfile | 8 +++--- data/Dockerfiles/dovecot/quarantine_notify.py | 28 +++++++++---------- data/Dockerfiles/dovecot/quota_notify.py | 16 +++++------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile index e0ed3491..8bc60d9f 100644 --- a/data/Dockerfiles/dovecot/Dockerfile +++ b/data/Dockerfiles/dovecot/Dockerfile @@ -71,10 +71,10 @@ RUN groupadd -g 5000 vmail \ libwww-perl \ mysql-client \ procps \ - python3-html2text \ - python3-jinja2 \ - python3-mysql.connector \ - python3-redis \ + python-html2text \ + python-jinja2 \ + python-mysql.connector \ + python-redis \ redis-server \ supervisor \ syslog-ng \ diff --git a/data/Dockerfiles/dovecot/quarantine_notify.py b/data/Dockerfiles/dovecot/quarantine_notify.py index 75b3c710..b1af332a 100755 --- a/data/Dockerfiles/dovecot/quarantine_notify.py +++ b/data/Dockerfiles/dovecot/quarantine_notify.py @@ -1,11 +1,11 @@ -#!/usr/bin/python3 +#!/usr/bin/python import smtplib import os import mysql.connector -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText -from email.utils import COMMASPACE, formatdate +from email.MIMEMultipart import MIMEMultipart +from email.MIMEText 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("{0} - trying again...".format(ex)) + print '%s - trying again...' % (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("{0} - trying again...".format(ex)) + print '%s - trying again...' % (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('{0}'.format(ex)) + print '%s' % (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 {0}, assuming never'.format(record['rcpt'])) + print 'Could not determine last notification for %s, assuming never' % (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 {0} about {1} new items in quarantine".format(record['rcpt'], record['counter'])) + print "Notifying %s about %d new items in quarantine" % (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 {0} about {1} new items in quarantine".format(record['rcpt'], record['counter'])) + print "Notifying %s about %d new items in quarantine" % (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 {0} about {1} new items in quarantine".format(record['rcpt'], record['counter'])) + print "Notifying %s about %d new items in quarantine" % (record['rcpt'], record['counter']) notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl']) diff --git a/data/Dockerfiles/dovecot/quota_notify.py b/data/Dockerfiles/dovecot/quota_notify.py index 064f3e78..669adec2 100755 --- a/data/Dockerfiles/dovecot/quota_notify.py +++ b/data/Dockerfiles/dovecot/quota_notify.py @@ -1,10 +1,10 @@ -#!/usr/bin/python3 +#!/usr/bin/python import smtplib import os -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText -from email.utils import COMMASPACE, formatdate +from email.MIMEMultipart import MIMEMultipart +from email.MIMEText import MIMEText +from email.Utils import COMMASPACE, formatdate import jinja2 from jinja2 import Template import redis @@ -17,7 +17,7 @@ if len(sys.argv) > 2: percent = int(sys.argv[1]) username = str(sys.argv[2]) else: - print("Args missing") + print "Args missing" sys.exit(1) while True: @@ -25,7 +25,7 @@ while True: r = redis.StrictRedis(host='redis', decode_responses=True, port=6379, db=0) r.ping() except Exception as ex: - print("{0} - trying again...".format(ex)) + print '%s - trying again...' % (ex) time.sleep(3) else: break @@ -34,7 +34,7 @@ if r.get('QW_HTML'): try: template = Template(r.get('QW_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/quota.tpl') as file_: template = Template(file_.read()) else: @@ -58,7 +58,7 @@ try: p.communicate(input=msg.as_string()) except Exception as ex: - print('Failed to send quota notification: {0}'.format(ex)) + print 'Failed to send quota notification: %s' % (ex) sys.exit(1) try: