NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed email to mail due to naming conflict in python2

Browse Source
This commit is contained in:
OzzieIsaacs 2020-08-30 08:49:53 +02:00
parent d406d91856
commit 62dd29d2f3
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/helper.py
View File

@ -64,7 +64,7 @@ from . import gdriveutils as gd
from .constants import STATIC_DIR as _STATIC_DIR from .constants import STATIC_DIR as _STATIC_DIR
from .subproc_wrapper import process_wait from .subproc_wrapper import process_wait
from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS 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() log = logger.create()

1
cps/services/worker.py
View File

@ -11,7 +11,6 @@ except ImportError:
from datetime import datetime, timedelta from datetime import datetime, timedelta
from collections import namedtuple from collections import namedtuple
from cps import calibre_db
from cps import logger from cps import logger
log = logger.create() log = logger.create()

2
cps/tasks/convert.py
View File

@ -14,7 +14,7 @@ from cps import logger, config
from cps.subproc_wrapper import process_open from cps.subproc_wrapper import process_open
from flask_babel import gettext as _ from flask_babel import gettext as _
from cps.tasks.email import TaskEmail from cps.tasks.mail import TaskEmail
from cps import gdriveutils from cps import gdriveutils
log = logger.create() log = logger.create()

0
cps/tasks/email.py → cps/tasks/mail.py
View File