From 62dd29d2f330e4a157d3da7a4806e603f9069980 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Aug 2020 08:49:53 +0200
Subject: [PATCH] Renamed email to mail due to naming conflict in python2

---
 cps/helper.py                   | 2 +-
 cps/services/worker.py          | 1 -
 cps/tasks/convert.py            | 2 +-
 cps/tasks/{email.py => mail.py} | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename cps/tasks/{email.py => mail.py} (100%)

diff --git a/cps/helper.py b/cps/helper.py
index fe938127..c2fc3ec0 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -64,7 +64,7 @@ from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
-from .tasks.email import TaskEmail
+from .tasks.mail import TaskEmail
 
 
 log = logger.create()
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 14c94df6..543d438f 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -11,7 +11,6 @@ except ImportError:
 from datetime import datetime, timedelta
 from collections import namedtuple
 
-from cps import calibre_db
 from cps import logger
 
 log = logger.create()
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 6a0ac402..ba905047 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -14,7 +14,7 @@ from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
 
-from cps.tasks.email import TaskEmail
+from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
 log = logger.create()
 
diff --git a/cps/tasks/email.py b/cps/tasks/mail.py
similarity index 100%
rename from cps/tasks/email.py
rename to cps/tasks/mail.py