Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
62dd29d2
Commit
62dd29d2
authored
Aug 30, 2020
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed email to mail due to naming conflict in python2
parent
d406d918
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
3 deletions
+2
-3
helper.py
cps/helper.py
+1
-1
worker.py
cps/services/worker.py
+0
-1
convert.py
cps/tasks/convert.py
+1
-1
mail.py
cps/tasks/mail.py
+0
-0
No files found.
cps/helper.py
View file @
62dd29d2
...
@@ -64,7 +64,7 @@ from . import gdriveutils as gd
...
@@ -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.
e
mail
import
TaskEmail
from
.tasks.mail
import
TaskEmail
log
=
logger
.
create
()
log
=
logger
.
create
()
...
...
cps/services/worker.py
View file @
62dd29d2
...
@@ -11,7 +11,6 @@ except ImportError:
...
@@ -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
()
...
...
cps/tasks/convert.py
View file @
62dd29d2
...
@@ -14,7 +14,7 @@ from cps import logger, config
...
@@ -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.
e
mail
import
TaskEmail
from
cps.tasks.mail
import
TaskEmail
from
cps
import
gdriveutils
from
cps
import
gdriveutils
log
=
logger
.
create
()
log
=
logger
.
create
()
...
...
cps/tasks/
e
mail.py
→
cps/tasks/mail.py
View file @
62dd29d2
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment