Merge remote-tracking branch 'sec_fixes/unused_imports' into master

cps/config_sql.py

@@ -19,7 +19,6 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
-import json
 import sys
 
 from sqlalchemy import exc, Column, String, Integer, SmallInteger, Boolean, BLOB, JSON

cps/converter.py

@@ -19,7 +19,6 @@
 from __future__ import division, print_function, unicode_literals
 import os
 import re
-import sys
 from flask_babel import gettext as _
 
 from . import config, logger

cps/editbooks.py

@@ -27,7 +27,6 @@ import json
 from shutil import copyfile
 from uuid import uuid4
 
-from babel import Locale as LC
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
 from flask_login import current_user, login_required

cps/helper.py

@@ -35,7 +35,7 @@ from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_login import current_user
-from sqlalchemy.sql.expression import true, false, and_, text, func
+from sqlalchemy.sql.expression import true, false, and_, text
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from . import calibre_db

cps/jinjia.py

@@ -25,7 +25,6 @@
 from __future__ import division, print_function, unicode_literals
 import datetime
 import mimetypes
-import re
 
 from babel.dates import format_date
 from flask import Blueprint, request, url_for

cps/kobo.py

@@ -39,7 +39,7 @@ from flask import (
     redirect,
     abort
 )
-from flask_login import current_user, login_required
+from flask_login import current_user
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
 from sqlalchemy.sql.expression import and_, or_

cps/tasks/convert.py

@@ -8,7 +8,7 @@ from shutil import copyfile
 
 from sqlalchemy.exc import SQLAlchemyError
 
-from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
+from cps.services.worker import CalibreTask
 from cps import calibre_db, db
 from cps import logger, config
 from cps.subproc_wrapper import process_open

cps/web.py

@@ -41,7 +41,7 @@ from flask_login import login_user, logout_user, login_required, current_user, c
 from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
 from sqlalchemy.sql.expression import text, func, true, false, not_, and_, or_
 from sqlalchemy.orm.attributes import flag_modified
-from werkzeug.exceptions import default_exceptions, InternalServerError
+from werkzeug.exceptions import default_exceptions
 from sqlalchemy.sql.functions import coalesce
 
 from .services.worker import WorkerThread