HEAD

openlp.py

@@ -30,7 +30,7 @@ import sys
 from OpenGL import GL
 
 from openlp.core.app import main
-from openlp.core.common import is_win, is_macosx
+from openlp.core.common import is_macosx, is_win
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.path import create_paths
 

openlp/core/api/deploy.py

@@ -25,7 +25,7 @@ Download and "install" the remote web client
 from zipfile import ZipFile
 
 from openlp.core.common.applocation import AppLocation
-from openlp.core.common.httputils import download_file, get_web_page, get_url_file_size
+from openlp.core.common.httputils import download_file, get_url_file_size, get_web_page
 from openlp.core.common.registry import Registry
 
 

openlp/core/api/endpoint/controller.py

@@ -34,6 +34,7 @@ from openlp.core.common.settings import Settings
 from openlp.core.lib import create_thumb
 from openlp.core.lib.serviceitem import ItemCapabilities
 
+
 log = logging.getLogger(__name__)
 
 controller_endpoint = Endpoint('controller')

openlp/core/api/endpoint/core.py

@@ -30,8 +30,8 @@ from openlp.core.api.http.endpoint import Endpoint
 from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.common.registry import Registry
 from openlp.core.lib import image_to_byte
-from openlp.core.lib.plugin import StringContent
+from openlp.core.lib.plugin import PluginStatus, StringContent
-from openlp.core.lib.plugin import PluginStatus
+
 
 template_dir = 'templates'
 static_dir = 'static'

openlp/core/api/endpoint/remote.py

@@ -24,6 +24,7 @@ import logging
 from openlp.core.api.endpoint.core import TRANSLATED_STRINGS
 from openlp.core.api.http.endpoint import Endpoint
 
+
 log = logging.getLogger(__name__)
 
 remote_endpoint = Endpoint('remote', template_dir='remotes')

openlp/core/api/endpoint/service.py

@@ -26,6 +26,7 @@ from openlp.core.api.http import requires_auth
 from openlp.core.api.http.endpoint import Endpoint
 from openlp.core.common.registry import Registry
 
+
 log = logging.getLogger(__name__)
 
 service_endpoint = Endpoint('service')

openlp/core/api/http/server.py

@@ -30,22 +30,21 @@ from PyQt5 import QtCore, QtWidgets
 from waitress.server import create_server
 
 from openlp.core.api.deploy import download_and_check, download_sha256
-from openlp.core.api.endpoint.controller import controller_endpoint, api_controller_endpoint
+from openlp.core.api.endpoint.controller import api_controller_endpoint, controller_endpoint
-from openlp.core.api.endpoint.core import chords_endpoint, stage_endpoint, blank_endpoint, main_endpoint
+from openlp.core.api.endpoint.core import blank_endpoint, chords_endpoint, main_endpoint, stage_endpoint
 from openlp.core.api.endpoint.remote import remote_endpoint
-from openlp.core.api.endpoint.service import service_endpoint, api_service_endpoint
+from openlp.core.api.endpoint.service import api_service_endpoint, service_endpoint
-from openlp.core.api.http import application
+from openlp.core.api.http import application, register_endpoint
-from openlp.core.api.http import register_endpoint
 from openlp.core.api.poll import Poller
 from openlp.core.common.applocation import AppLocation
-from openlp.core.common.i18n import UiStrings
+from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.common.i18n import translate
 from openlp.core.common.mixins import LogMixin, RegistryProperties
 from openlp.core.common.path import create_paths
 from openlp.core.common.registry import Registry, RegistryBase
 from openlp.core.common.settings import Settings
 from openlp.core.threading import ThreadWorker, run_thread
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/api/http/wsgiapp.py

@@ -33,6 +33,7 @@ from webob.static import DirectoryApp
 from openlp.core.api.http.errors import HttpError, NotFound, ServerError
 from openlp.core.common.applocation import AppLocation
 
+
 ARGS_REGEX = re.compile(r'''\{(\w+)(?::([^}]+))?\}''', re.VERBOSE)
 
 log = logging.getLogger(__name__)

openlp/core/api/tab.py

@@ -31,6 +31,7 @@ from openlp.core.common.settings import Settings
 from openlp.core.lib.settingstab import SettingsTab
 from openlp.core.ui.icons import UiIcons
 
+
 ZERO_URL = '0.0.0.0'
 
 

openlp/core/api/websockets.py

@@ -35,6 +35,7 @@ from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.threading import ThreadWorker, run_thread
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/app.py

@@ -33,25 +33,26 @@ import time
 from datetime import datetime
 from traceback import format_exception
 
-from PyQt5 import QtCore, QtWidgets, QtWebEngineWidgets                                                 # noqa
+from PyQt5 import QtCore, QtWebEngineWidgets, QtWidgets  # noqa
 
 from openlp.core.common import is_macosx, is_win
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.i18n import LanguageManager, UiStrings, translate
-from openlp.core.common.path import create_paths, copytree
+from openlp.core.common.path import copytree, create_paths
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.display.screens import ScreenList
 from openlp.core.resources import qInitResources
-from openlp.core.ui.splashscreen import SplashScreen
+from openlp.core.server import Server
 from openlp.core.ui.exceptionform import ExceptionForm
 from openlp.core.ui.firsttimeform import FirstTimeForm
 from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
 from openlp.core.ui.mainwindow import MainWindow
+from openlp.core.ui.splashscreen import SplashScreen
 from openlp.core.ui.style import get_application_stylesheet
-from openlp.core.server import Server
 from openlp.core.version import check_for_update, get_version
 
+
 __all__ = ['OpenLP', 'main']
 
 

openlp/core/common/actions.py

@@ -29,6 +29,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common.settings import Settings
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/common/applocation.py

@@ -27,10 +27,11 @@ import os
 import sys
 
 import openlp
-from openlp.core.common import get_frozen_path, is_win, is_macosx
+from openlp.core.common import get_frozen_path, is_macosx, is_win
 from openlp.core.common.path import Path, create_paths
 from openlp.core.common.settings import Settings
 
+
 if not is_win() and not is_macosx():
     try:
         from xdg import BaseDirectory

openlp/core/common/db.py

@@ -27,6 +27,7 @@ from copy import deepcopy
 
 import sqlalchemy
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/common/httputils.py

@@ -34,6 +34,7 @@ from openlp.core.common import trace_error_handler
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import ProxyMode, Settings
 
+
 log = logging.getLogger(__name__ + '.__init__')
 
 USER_AGENTS = {

openlp/core/common/i18n.py

@@ -30,10 +30,11 @@ from collections import namedtuple
 
 from PyQt5 import QtCore, QtWidgets
 
-from openlp.core.common import is_win, is_macosx
+from openlp.core.common import is_macosx, is_win
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.settings import Settings
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/common/mixins.py

@@ -28,6 +28,7 @@ import logging
 from openlp.core.common import is_win, trace_error_handler
 from openlp.core.common.registry import Registry
 
+
 DO_NOT_TRACE_EVENTS = ['timerEvent', 'paintEvent', 'drag_enter_event', 'drop_event', 'on_controller_size_changed',
                        'preview_size_changed', 'resizeEvent']
 

openlp/core/common/path.py

@@ -25,6 +25,7 @@ from contextlib import suppress
 
 from openlp.core.common import is_win
 
+
 if is_win():
     from pathlib import WindowsPath as PathVariant          # pragma: nocover
 else:

openlp/core/common/registry.py

@@ -27,6 +27,7 @@ import sys
 
 from openlp.core.common import de_hump, trace_error_handler
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/common/settings.py

@@ -33,7 +33,8 @@ from PyQt5 import QtCore, QtGui
 
 from openlp.core.common import SlideLimits, ThemeLevel, is_linux, is_win
 from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder
-from openlp.core.common.path import Path, str_to_path, files_to_paths
+from openlp.core.common.path import Path, files_to_paths, str_to_path
+
 
 log = logging.getLogger(__name__)
 

openlp/core/display/canvas.py

@@ -32,7 +32,7 @@ import json
 import logging
 import os
 
-from PyQt5 import QtCore, QtWidgets, QtGui, QtMultimedia, QtWebChannel, QtWebEngineWidgets
+from PyQt5 import QtCore, QtGui, QtMultimedia, QtWebChannel, QtWebEngineWidgets, QtWidgets
 
 from openlp.core.common import is_macosx, is_win
 from openlp.core.common.applocation import AppLocation
@@ -41,12 +41,13 @@ from openlp.core.common.mixins import LogMixin, RegistryProperties
 from openlp.core.common.path import path_to_str
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
+from openlp.core.display.screens import ScreenList
 from openlp.core.display.webengine import WebEngineView
 from openlp.core.display.window import MediaWatcher
-from openlp.core.display.screens import ScreenList
+from openlp.core.lib import ImageSource, ServiceItem, build_html, expand_tags, image_to_byte
-from openlp.core.lib import ServiceItem, ImageSource, build_html, expand_tags, image_to_byte
 from openlp.core.lib.theme import BackgroundType
-from openlp.core.ui import HideMode, AlertLocation, DisplayControllerType
+from openlp.core.ui import AlertLocation, DisplayControllerType, HideMode
+
 
 if is_macosx():
     from ctypes import pythonapi, c_void_p, c_char_p, py_object

openlp/core/display/render.py

@@ -36,6 +36,7 @@ from openlp.core.display.window import DisplayWindow
 from openlp.core.display.screens import ScreenList
 from openlp.core.lib import ItemCapabilities
 
+
 log = logging.getLogger(__name__)
 
 SLIM_CHARS = 'fiíIÍjlĺľrtť.,;/ ()|"\'!:\\'

openlp/core/display/screens.py

@@ -32,6 +32,7 @@ from openlp.core.common.i18n import translate
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/display/webengine.py

@@ -25,7 +25,8 @@ Heavily inspired by https://stackoverflow.com/questions/33467776/qt-qwebengine-r
 """
 import logging
 
-from PyQt5 import QtCore, QtWidgets, QtWebEngineWidgets
+from PyQt5 import QtCore, QtWebEngineWidgets, QtWidgets
+
 
 LOG_LEVELS = {
     QtWebEngineWidgets.QWebEnginePage.InfoMessageLevel: logging.INFO,

openlp/core/display/window.py

@@ -22,14 +22,15 @@
 """
 The :mod:`~openlp.core.display.window` module contains the display window
 """
+import json
 import logging
 import os
-import json
 
-from PyQt5 import QtCore, QtWidgets, QtWebChannel
+from PyQt5 import QtCore, QtWebChannel, QtWidgets
 
 from openlp.core.common.path import Path, path_to_str
 
+
 log = logging.getLogger(__name__)
 DISPLAY_PATH = Path(__file__).parent / 'html' / 'display.html'
 

openlp/core/lib/db.py

@@ -31,10 +31,10 @@ from urllib.parse import quote_plus as urlquote
 
 from alembic.migration import MigrationContext
 from alembic.operations import Operations
-from sqlalchemy import Table, MetaData, Column, UnicodeText, types, create_engine
+from sqlalchemy import Column, MetaData, Table, UnicodeText, create_engine, types
 from sqlalchemy.engine.url import make_url
-from sqlalchemy.exc import SQLAlchemyError, InvalidRequestError, DBAPIError, OperationalError, ProgrammingError
+from sqlalchemy.exc import DBAPIError, InvalidRequestError, OperationalError, ProgrammingError, SQLAlchemyError
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper
+from sqlalchemy.orm import mapper, scoped_session, sessionmaker
 from sqlalchemy.pool import NullPool
 
 from openlp.core.common import delete_file
@@ -44,6 +44,7 @@ from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder
 from openlp.core.common.settings import Settings
 from openlp.core.lib.ui import critical_error_message_box
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/lib/htmlbuilder.py

@@ -408,10 +408,12 @@ is the function which has to be called from outside. The generated and returned
 """
 import logging
 from string import Template
+
 from PyQt5 import QtWebEngine
 
 from openlp.core.common.settings import Settings
-from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, VerticalType, HorizontalType
+from openlp.core.lib.theme import BackgroundGradientType, BackgroundType, HorizontalType, VerticalType
+
 
 log = logging.getLogger(__name__)
 

openlp/core/lib/imagemanager.py

@@ -34,9 +34,10 @@ from PyQt5 import QtCore
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.display.screens import ScreenList
-from openlp.core.lib import resize_image, image_to_byte
+from openlp.core.lib import image_to_byte, resize_image
 from openlp.core.threading import ThreadWorker, run_thread
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/lib/mediamanageritem.py

@@ -28,7 +28,6 @@ import re
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.path import path_to_str, str_to_path
 from openlp.core.common.registry import Registry
@@ -37,11 +36,13 @@ from openlp.core.lib import ServiceItemContext
 from openlp.core.lib.plugin import StringContent
 from openlp.core.lib.serviceitem import ServiceItem
 from openlp.core.lib.ui import create_widget_action, critical_error_message_box
+from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.dialogs import FileDialog
 from openlp.core.widgets.edits import SearchEdit
 from openlp.core.widgets.toolbar import OpenLPToolbar
 from openlp.core.widgets.views import ListWidgetWithDnD
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/lib/plugin.py

@@ -32,6 +32,7 @@ from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.version import get_version
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/lib/serviceitem.py

@@ -35,12 +35,13 @@ from PyQt5 import QtGui
 from openlp.core.common import md5_hash
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.i18n import translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.path import Path
 from openlp.core.common.settings import Settings
 from openlp.core.display.render import remove_tags, render_tags
 from openlp.core.lib import ImageSource, ItemCapabilities, build_icon
+from openlp.core.ui.icons import UiIcons
+
 
 log = logging.getLogger(__name__)
 

openlp/core/lib/theme.py

@@ -32,7 +32,8 @@ from openlp.core.common.applocation import AppLocation
 from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder
 from openlp.core.common.path import Path, str_to_path
 from openlp.core.display.screens import ScreenList
-from openlp.core.lib import str_to_bool, get_text_file_string
+from openlp.core.lib import get_text_file_string, str_to_bool
+
 
 log = logging.getLogger(__name__)
 

openlp/core/lib/ui.py

@@ -33,6 +33,7 @@ from openlp.core.common.registry import Registry
 from openlp.core.lib import build_icon
 from openlp.core.ui.icons import UiIcons
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/projectors/constants.py

@@ -26,6 +26,7 @@ import logging
 
 from openlp.core.common.i18n import translate
 
+
 log = logging.getLogger(__name__)
 log.debug('projector_constants loaded')
 

openlp/core/projectors/db.py

@@ -35,16 +35,20 @@ The Projector table keeps track of entries for controlled projectors.
 """
 
 import logging
-log = logging.getLogger(__name__)
-log.debug('projector.lib.db module loaded')
 
 from sqlalchemy import Column, ForeignKey, Integer, MetaData, String, and_
 from sqlalchemy.ext.declarative import declarative_base, declared_attr
 from sqlalchemy.orm import relationship
 
 from openlp.core.lib.db import Manager, init_db, init_url
-from openlp.core.projectors.constants import PJLINK_DEFAULT_CODES
 from openlp.core.projectors import upgrade
+from openlp.core.projectors.constants import PJLINK_DEFAULT_CODES
+
+
+log = logging.getLogger(__name__)
+log.debug('projector.lib.db module loaded')
+
+
 
 Base = declarative_base(MetaData())
 

openlp/core/projectors/editform.py

@@ -29,9 +29,10 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common import verify_ip_address
 from openlp.core.common.i18n import translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.projectors.constants import PJLINK_PORT
 from openlp.core.projectors.db import Projector
+from openlp.core.ui.icons import UiIcons
+
 
 log = logging.getLogger(__name__)
 log.debug('editform loaded')

openlp/core/projectors/manager.py

@@ -30,22 +30,22 @@ import logging
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.common.mixins import LogMixin, RegistryProperties
 from openlp.core.common.registry import RegistryBase
 from openlp.core.common.settings import Settings
 from openlp.core.lib.ui import create_widget_action
 from openlp.core.projectors import DialogSourceStyle
-from openlp.core.projectors.constants import E_AUTHENTICATION, E_ERROR, E_NETWORK, E_NOT_CONNECTED, \
+from openlp.core.projectors.constants import E_AUTHENTICATION, E_ERROR, E_NETWORK, E_NOT_CONNECTED, E_SOCKET_TIMEOUT, \
-    E_SOCKET_TIMEOUT, E_UNKNOWN_SOCKET_ERROR, S_CONNECTED, S_CONNECTING, S_COOLDOWN, S_INITIALIZE, \
+    E_UNKNOWN_SOCKET_ERROR, PJLINK_PORT, QSOCKET_STATE, S_CONNECTED, S_CONNECTING, S_COOLDOWN, S_INITIALIZE, \
-    S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP, PJLINK_PORT, STATUS_CODE, STATUS_MSG, QSOCKET_STATE
+    S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP, STATUS_CODE, STATUS_MSG
-
 from openlp.core.projectors.db import ProjectorDB
 from openlp.core.projectors.editform import ProjectorEditForm
 from openlp.core.projectors.pjlink import PJLink, PJLinkUDP
-from openlp.core.projectors.sourceselectform import SourceSelectTabs, SourceSelectSingle
+from openlp.core.projectors.sourceselectform import SourceSelectSingle, SourceSelectTabs
+from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.toolbar import OpenLPToolbar
 
+
 log = logging.getLogger(__name__)
 log.debug('projectormanager loaded')
 

openlp/core/projectors/pjlink.py

@@ -55,11 +55,12 @@ from PyQt5 import QtCore, QtNetwork
 from openlp.core.common import qmd5_hash
 from openlp.core.common.i18n import translate
 from openlp.core.common.settings import Settings
-from openlp.core.projectors.constants import CONNECTION_ERRORS, PJLINK_CLASS, PJLINK_DEFAULT_CODES, PJLINK_ERRORS, \
+from openlp.core.projectors.constants import CONNECTION_ERRORS, E_AUTHENTICATION, E_CONNECTION_REFUSED, E_GENERAL, \
-    PJLINK_ERST_DATA, PJLINK_ERST_STATUS, PJLINK_MAX_PACKET, PJLINK_PREFIX, PJLINK_PORT, PJLINK_POWR_STATUS, \
+    E_NETWORK, E_NOT_CONNECTED, E_SOCKET_TIMEOUT, PJLINK_CLASS, PJLINK_DEFAULT_CODES, PJLINK_ERRORS, PJLINK_ERST_DATA, \
-    PJLINK_SUFFIX, PJLINK_VALID_CMD, PROJECTOR_STATE, STATUS_CODE, STATUS_MSG, QSOCKET_STATE, \
+    PJLINK_ERST_STATUS, PJLINK_MAX_PACKET, PJLINK_PORT, PJLINK_POWR_STATUS, PJLINK_PREFIX, PJLINK_SUFFIX, \
-    E_AUTHENTICATION, E_CONNECTION_REFUSED, E_GENERAL, E_NETWORK, E_NOT_CONNECTED, E_SOCKET_TIMEOUT, \
+    PJLINK_VALID_CMD, PROJECTOR_STATE, QSOCKET_STATE, S_CONNECTED, S_CONNECTING, S_NOT_CONNECTED, S_OFF, S_OK, S_ON, \
-    S_CONNECTED, S_CONNECTING, S_NOT_CONNECTED, S_OFF, S_OK, S_ON, S_STANDBY
+    S_STANDBY, STATUS_CODE, STATUS_MSG
+
 
 log = logging.getLogger(__name__)
 log.debug('pjlink loaded')

openlp/core/projectors/sourceselectform.py

@@ -31,9 +31,10 @@ from PyQt5 import QtCore, QtWidgets
 from openlp.core.common import is_macosx
 from openlp.core.common.i18n import translate
 from openlp.core.lib import build_icon
-from openlp.core.projectors.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES
+from openlp.core.projectors.constants import PJLINK_DEFAULT_CODES, PJLINK_DEFAULT_SOURCES
 from openlp.core.projectors.db import ProjectorSource
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/projectors/tab.py

@@ -29,8 +29,9 @@ from PyQt5 import QtWidgets
 from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.common.settings import Settings
 from openlp.core.lib.settingstab import SettingsTab
-from openlp.core.ui.icons import UiIcons
 from openlp.core.projectors import DialogSourceStyle
+from openlp.core.ui.icons import UiIcons
+
 
 log = logging.getLogger(__name__)
 log.debug('projectortab module loaded')

openlp/core/projectors/upgrade.py

@@ -25,11 +25,12 @@ backend for the projector setup.
 """
 import logging
 
-from sqlalchemy import Table, Column, types
+from sqlalchemy import Column, Table, types
 from sqlalchemy.sql.expression import null
 
 from openlp.core.lib.db import get_upgrade_op
 
+
 log = logging.getLogger(__name__)
 
 # Initial projector DB was unversioned

openlp/core/server.py

@@ -21,8 +21,8 @@
 ###############################################################################
 from PyQt5 import QtCore, QtNetwork
 
-from openlp.core.common.registry import Registry
 from openlp.core.common.mixins import LogMixin
+from openlp.core.common.registry import Registry
 
 
 class Server(QtCore.QObject, LogMixin):

openlp/core/ui/aboutform.py

@@ -28,6 +28,7 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
 from openlp.core.version import get_version
+
 from .aboutdialog import UiAboutDialog
 
 

openlp/core/ui/advancedtab.py

@@ -32,12 +32,13 @@ from openlp.core.common.applocation import AppLocation
 from openlp.core.common.i18n import UiStrings, format_time, translate
 from openlp.core.common.settings import Settings
 from openlp.core.lib.settingstab import SettingsTab
-from openlp.core.ui.style import HAS_DARK_STYLE
 from openlp.core.ui.icons import UiIcons
+from openlp.core.ui.style import HAS_DARK_STYLE
 from openlp.core.widgets.edits import PathEdit
 from openlp.core.widgets.enums import PathEditType
 from openlp.core.widgets.widgets import ProxyWidget
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/ui/exceptiondialog.py

@@ -26,8 +26,8 @@ The GUI widgets of the exception dialog.
 from PyQt5 import QtGui, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.lib.ui import create_button, create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_ExceptionDialog(object):

openlp/core/ui/exceptionform.py

@@ -34,7 +34,7 @@ from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.settings import Settings
 from openlp.core.ui.exceptiondialog import Ui_ExceptionDialog
-from openlp.core.version import get_version, get_library_versions
+from openlp.core.version import get_library_versions, get_version
 from openlp.core.widgets.dialogs import FileDialog
 
 

openlp/core/ui/firsttimeform.py

@@ -34,7 +34,7 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common import clean_button_text, trace_error_handler
 from openlp.core.common.applocation import AppLocation
-from openlp.core.common.httputils import get_web_page, get_url_file_size, download_file
+from openlp.core.common.httputils import download_file, get_url_file_size, get_web_page
 from openlp.core.common.i18n import translate
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.path import Path, create_paths
@@ -43,8 +43,9 @@ from openlp.core.common.settings import Settings
 from openlp.core.lib import build_icon
 from openlp.core.lib.plugin import PluginStatus
 from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.threading import ThreadWorker, run_thread, get_thread_worker, is_thread_finished
+from openlp.core.threading import ThreadWorker, get_thread_worker, is_thread_finished, run_thread
-from openlp.core.ui.firsttimewizard import UiFirstTimeWizard, FirstTimePage
+from openlp.core.ui.firsttimewizard import FirstTimePage, UiFirstTimeWizard
+
 
 log = logging.getLogger(__name__)
 

openlp/core/ui/firsttimelanguageform.py

@@ -26,6 +26,7 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import LanguageManager
 from openlp.core.lib.ui import create_action
+
 from .firsttimelanguagedialog import Ui_FirstTimeLanguageDialog
 
 

openlp/core/ui/firsttimewizard.py

@@ -24,7 +24,7 @@ The UI widgets for the first time wizard.
 """
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-from openlp.core.common import is_macosx, clean_button_text
+from openlp.core.common import clean_button_text, is_macosx
 from openlp.core.common.i18n import translate
 from openlp.core.common.settings import Settings
 from openlp.core.lib.ui import add_welcome_page

openlp/core/ui/formattingtagdialog.py

@@ -25,8 +25,8 @@ The UI widgets for the formatting tags window.
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_FormattingTagDialog(object):

openlp/core/ui/generaltab.py

@@ -35,6 +35,7 @@ from openlp.core.lib.settingstab import SettingsTab
 from openlp.core.widgets.buttons import ColorButton
 from openlp.core.widgets.edits import PathEdit
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/ui/icons.py

@@ -23,13 +23,14 @@
 The :mod:`languages` module provides a list of icons.
 """
 import logging
-import qtawesome as qta
 
+import qtawesome as qta
 from PyQt5 import QtGui, QtWidgets
 
 from openlp.core.common.applocation import AppLocation
 from openlp.core.lib import build_icon
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/ui/mainwindow.py

@@ -32,11 +32,10 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.api import websockets
 from openlp.core.api.http import server
-from openlp.core.common import is_win, is_macosx, add_actions
+from openlp.core.common import add_actions, is_macosx, is_win
 from openlp.core.common.actions import ActionList, CategoryOrder
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.i18n import LanguageManager, UiStrings, translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.common.mixins import LogMixin, RegistryProperties
 from openlp.core.common.path import Path, copyfile, create_paths
 from openlp.core.common.registry import Registry
@@ -48,21 +47,22 @@ from openlp.core.lib.plugin import PluginStatus
 from openlp.core.lib.pluginmanager import PluginManager
 from openlp.core.lib.ui import create_action
 from openlp.core.projectors.manager import ProjectorManager
-from openlp.core.ui.shortcutlistform import ShortcutListForm
-from openlp.core.ui.formattingtagform import FormattingTagForm
-from openlp.core.ui.thememanager import ThemeManager
-from openlp.core.ui.servicemanager import ServiceManager
 from openlp.core.ui.aboutform import AboutForm
-from openlp.core.ui.pluginform import PluginForm
-from openlp.core.ui.slidecontroller import LiveController, PreviewController
-from openlp.core.ui.settingsform import SettingsForm
 from openlp.core.ui.firsttimeform import FirstTimeForm
+from openlp.core.ui.formattingtagform import FormattingTagForm
+from openlp.core.ui.icons import UiIcons
 from openlp.core.ui.media import MediaController
+from openlp.core.ui.pluginform import PluginForm
 from openlp.core.ui.printserviceform import PrintServiceForm
+from openlp.core.ui.servicemanager import ServiceManager
+from openlp.core.ui.settingsform import SettingsForm
+from openlp.core.ui.shortcutlistform import ShortcutListForm
+from openlp.core.ui.slidecontroller import LiveController, PreviewController
 from openlp.core.ui.style import PROGRESSBAR_STYLE, get_library_stylesheet
+from openlp.core.ui.thememanager import ThemeManager
 from openlp.core.version import get_version
 from openlp.core.widgets.dialogs import FileDialog
-from openlp.core.widgets.docks import OpenLPDockWidget, MediaDockManager
+from openlp.core.widgets.docks import MediaDockManager, OpenLPDockWidget
 
 
 class Ui_MainWindow(object):

openlp/core/ui/media/endpoint.py

@@ -28,6 +28,7 @@ from openlp.core.api.http import requires_auth
 from openlp.core.api.http.endpoint import Endpoint
 from openlp.core.common.registry import Registry
 
+
 log = logging.getLogger(__name__)
 media_endpoint = Endpoint('media')
 

openlp/core/ui/media/mediacontroller.py

@@ -39,13 +39,14 @@ from openlp.core.lib.serviceitem import ItemCapabilities
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.ui import DisplayControllerType
 from openlp.core.ui.icons import UiIcons
-from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \
+from openlp.core.ui.media import MediaInfo, MediaState, MediaType, get_media_players, parse_optical_path, \
-    parse_optical_path
+    set_media_players
 from openlp.core.ui.media.endpoint import media_endpoint
 from openlp.core.ui.media.mediaplayer import MediaPlayer
 from openlp.core.ui.media.vendor.mediainfoWrapper import MediaInfoWrapper
 from openlp.core.widgets.toolbar import OpenLPToolbar
 
+
 log = logging.getLogger(__name__)
 
 TICK_TIME = 200

openlp/core/ui/media/systemplayer.py

@@ -29,9 +29,10 @@ import mimetypes
 from PyQt5 import QtCore, QtMultimedia, QtMultimediaWidgets
 
 from openlp.core.common.i18n import translate
+from openlp.core.threading import ThreadWorker, is_thread_finished, run_thread
 from openlp.core.ui.media import MediaState
 from openlp.core.ui.media.mediaplayer import MediaPlayer
-from openlp.core.threading import ThreadWorker, run_thread, is_thread_finished
+
 
 log = logging.getLogger(__name__)
 

openlp/core/ui/media/vendor/mediainfoWrapper.py

@@ -29,6 +29,7 @@ from subprocess import check_output
 
 from bs4 import BeautifulSoup, NavigableString
 
+
 ENV_DICT = os.environ
 
 

openlp/core/ui/media/vendor/vlc.py

@@ -47,6 +47,7 @@ from ctypes.util import find_library
 # Used by EventManager in override.py
 from inspect import getargspec
 
+
 __version__ = "N/A"
 build_date  = "Mon Jan 25 19:40:05 2016"
 

openlp/core/ui/media/vlcplayer.py

@@ -32,12 +32,13 @@ from distutils.version import LooseVersion
 
 from PyQt5 import QtWidgets
 
-from openlp.core.common import is_win, is_macosx, is_linux
+from openlp.core.common import is_linux, is_macosx, is_win
 from openlp.core.common.i18n import translate
 from openlp.core.common.settings import Settings
 from openlp.core.ui.media import MediaState, MediaType
 from openlp.core.ui.media.mediaplayer import MediaPlayer
 
+
 log = logging.getLogger(__name__)
 
 # Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source

openlp/core/ui/pluginform.py

@@ -31,6 +31,7 @@ from openlp.core.common.mixins import RegistryProperties
 from openlp.core.lib.plugin import PluginStatus
 from openlp.core.ui.plugindialog import Ui_PluginViewDialog
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/ui/printservicedialog.py

@@ -22,7 +22,7 @@
 """
 The UI widgets of the print service dialog.
 """
-from PyQt5 import QtCore, QtWidgets, QtPrintSupport
+from PyQt5 import QtCore, QtPrintSupport, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.ui.icons import UiIcons

openlp/core/ui/printserviceform.py

@@ -26,7 +26,7 @@ import datetime
 import html
 
 import lxml.html
-from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport
+from PyQt5 import QtCore, QtGui, QtPrintSupport, QtWidgets
 
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.i18n import UiStrings, translate
@@ -36,6 +36,7 @@ from openlp.core.common.settings import Settings
 from openlp.core.lib import get_text_file_string, image_to_byte
 from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize
 
+
 DEFAULT_CSS = """/*
 Edit this file to customize the service order print. Note, that not all CSS
 properties are supported. See:

openlp/core/ui/screenstab.py

@@ -32,6 +32,7 @@ from openlp.core.display.screens import ScreenList
 from openlp.core.lib.settingstab import SettingsTab
 from openlp.core.ui.icons import UiIcons
 
+
 SCREENS_LAYOUT_STYLE = """
 #screen_frame {
   background-color: palette(base);

openlp/core/ui/serviceitemeditdialog.py

@@ -25,7 +25,7 @@ The UI widgets for the service item edit dialog
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib.ui import create_button_box, create_button
+from openlp.core.lib.ui import create_button, create_button_box
 from openlp.core.ui.icons import UiIcons
 
 

openlp/core/ui/servicemanager.py

@@ -37,17 +37,17 @@ from openlp.core.common import ThemeLevel, delete_file
 from openlp.core.common.actions import ActionList, CategoryOrder
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.i18n import UiStrings, format_time, translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder
 from openlp.core.common.mixins import LogMixin, RegistryProperties
 from openlp.core.common.path import Path, str_to_path
 from openlp.core.common.registry import Registry, RegistryBase
 from openlp.core.common.settings import Settings
 from openlp.core.lib import build_icon
-from openlp.core.lib.plugin import PluginStatus
-from openlp.core.lib.serviceitem import ServiceItem, ItemCapabilities
 from openlp.core.lib.exceptions import ValidationError
-from openlp.core.lib.ui import critical_error_message_box, create_widget_action, find_and_set_in_combo_box
+from openlp.core.lib.plugin import PluginStatus
+from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem
+from openlp.core.lib.ui import create_widget_action, critical_error_message_box, find_and_set_in_combo_box
+from openlp.core.ui.icons import UiIcons
 from openlp.core.ui.serviceitemeditform import ServiceItemEditForm
 from openlp.core.ui.servicenoteform import ServiceNoteForm
 from openlp.core.ui.starttimeform import StartTimeForm

openlp/core/ui/settingsform.py

@@ -33,10 +33,11 @@ from openlp.core.lib import build_icon
 from openlp.core.projectors.tab import ProjectorTab
 from openlp.core.ui.advancedtab import AdvancedTab
 from openlp.core.ui.generaltab import GeneralTab
-from openlp.core.ui.screenstab import ScreensTab
-from openlp.core.ui.themestab import ThemesTab
 from openlp.core.ui.media import PlayerTab
+from openlp.core.ui.screenstab import ScreensTab
 from openlp.core.ui.settingsdialog import Ui_SettingsDialog
+from openlp.core.ui.themestab import ThemesTab
+
 
 log = logging.getLogger(__name__)
 

openlp/core/ui/shortcutlistform.py

@@ -33,6 +33,7 @@ from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.settings import Settings
 from openlp.core.ui.shortcutlistdialog import Ui_ShortcutListDialog
 
+
 REMOVE_AMPERSAND = re.compile(r'&{1}')
 
 log = logging.getLogger(__name__)

openlp/core/ui/slidecontroller.py

@@ -35,16 +35,17 @@ from openlp.core.common.mixins import LogMixin, RegistryProperties
 from openlp.core.common.registry import Registry, RegistryBase
 from openlp.core.common.settings import Settings
 from openlp.core.display.screens import ScreenList
+from openlp.core.display.window import DisplayWindow
 from openlp.core.lib import ImageSource, ServiceItemAction
 from openlp.core.lib.serviceitem import ItemCapabilities
 from openlp.core.lib.ui import create_action
-from openlp.core.ui import HideMode, DisplayControllerType
+from openlp.core.ui import DisplayControllerType, HideMode
 from openlp.core.ui.icons import UiIcons
-from openlp.core.display.window import DisplayWindow
 from openlp.core.widgets.layouts import AspectRatioLayout
 from openlp.core.widgets.toolbar import OpenLPToolbar
 from openlp.core.widgets.views import ListPreviewWidget
 
+
 # Threshold which has to be trespassed to toggle.
 HIDE_MENU_THRESHOLD = 27
 AUDIO_TIME_LABEL_STYLESHEET = 'background-color: palette(background); ' \

openlp/core/ui/style.py

@@ -28,6 +28,7 @@ from openlp.core.common import is_win
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 
+
 try:
     import qdarkstyle
     HAS_DARK_STYLE = True

openlp/core/ui/themeform.py

@@ -30,12 +30,13 @@ from openlp.core.common import get_images_filter, is_not_image_file
 from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.registry import Registry
-from openlp.core.lib.theme import BackgroundType, BackgroundGradientType
+from openlp.core.lib.theme import BackgroundGradientType, BackgroundType
 from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.ui.themelayoutform import ThemeLayoutForm
-from openlp.core.ui.themewizard import Ui_ThemeWizard
 # TODO: Fix this. Use a "get_video_extensions" method which uses the current media player
 from openlp.core.ui.media.vlcplayer import VIDEO_EXT
+from openlp.core.ui.themelayoutform import ThemeLayoutForm
+from openlp.core.ui.themewizard import Ui_ThemeWizard
+
 
 log = logging.getLogger(__name__)
 

openlp/core/ui/thememanager.py

@@ -24,24 +24,24 @@ The Theme Manager manages adding, deleteing and modifying of themes.
 """
 import os
 import zipfile
-from xml.etree.ElementTree import ElementTree, XML
+from xml.etree.ElementTree import XML, ElementTree
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import delete_file
 from openlp.core.common.applocation import AppLocation
-from openlp.core.common.i18n import UiStrings, translate, get_locale_key
+from openlp.core.common.i18n import UiStrings, get_locale_key, translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.common.mixins import LogMixin, RegistryProperties
 from openlp.core.common.path import Path, copyfile, create_paths, path_to_str
 from openlp.core.common.registry import Registry, RegistryBase
 from openlp.core.common.settings import Settings
-from openlp.core.lib import ImageSource, get_text_file_string, build_icon, \
+from openlp.core.lib import ImageSource, build_icon, check_item_selected, create_thumb, get_text_file_string, \
-    check_item_selected, create_thumb, validate_thumb
+    validate_thumb
 from openlp.core.lib.exceptions import ValidationError
-from openlp.core.lib.theme import Theme, BackgroundType
+from openlp.core.lib.theme import BackgroundType, Theme
-from openlp.core.lib.ui import critical_error_message_box, create_widget_action
+from openlp.core.lib.ui import create_widget_action, critical_error_message_box
 from openlp.core.ui.filerenameform import FileRenameForm
+from openlp.core.ui.icons import UiIcons
 from openlp.core.ui.themeform import ThemeForm
 from openlp.core.widgets.dialogs import FileDialog
 from openlp.core.widgets.toolbar import OpenLPToolbar

openlp/core/ui/themewizard.py

@@ -26,7 +26,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import is_macosx
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib.theme import HorizontalType, BackgroundType, BackgroundGradientType
+from openlp.core.lib.theme import BackgroundGradientType, BackgroundType, HorizontalType
 from openlp.core.lib.ui import add_welcome_page, create_valign_selection_widgets
 from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.buttons import ColorButton

openlp/core/version.py

@@ -29,7 +29,7 @@ import time
 from collections import OrderedDict
 from datetime import date
 from distutils.version import LooseVersion
-from subprocess import Popen, PIPE
+from subprocess import PIPE, Popen
 
 import requests
 from PyQt5 import QtCore
@@ -38,6 +38,7 @@ from openlp.core.common.applocation import AppLocation
 from openlp.core.common.settings import Settings
 from openlp.core.threading import ThreadWorker, run_thread
 
+
 log = logging.getLogger(__name__)
 
 APPLICATION_VERSION = {}

openlp/core/widgets/docks.py

@@ -30,6 +30,7 @@ from openlp.core.display.screens import ScreenList
 from openlp.core.lib import build_icon
 from openlp.core.lib.plugin import StringContent
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/widgets/edits.py

@@ -33,11 +33,12 @@ from openlp.core.common.path import Path, path_to_str, str_to_path
 from openlp.core.common.settings import Settings
 from openlp.core.lib import build_icon
 from openlp.core.lib.formattingtags import FormattingTags
-from openlp.core.lib.ui import create_widget_action, create_action
+from openlp.core.lib.ui import create_action, create_widget_action
 from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.dialogs import FileDialog
 from openlp.core.widgets.enums import PathEditType
 
+
 try:
     import enchant
     from enchant import DictNotFoundError

openlp/core/widgets/toolbar.py

@@ -28,6 +28,7 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.lib.ui import create_widget_action
 
+
 log = logging.getLogger(__name__)
 
 

openlp/core/widgets/wizard.py

@@ -28,14 +28,15 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import is_macosx
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.lib import build_icon
 from openlp.core.lib.ui import add_welcome_page
+from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.dialogs import FileDialog
 
+
 log = logging.getLogger(__name__)
 
 

openlp/plugins/alerts/alertsplugin.py

@@ -28,17 +28,18 @@ from openlp.core.api.http import register_endpoint
 from openlp.core.common.actions import ActionList
 from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.common.settings import Settings
-from openlp.core.lib.plugin import Plugin, StringContent
 from openlp.core.lib.db import Manager
+from openlp.core.lib.plugin import Plugin, StringContent
 from openlp.core.lib.theme import VerticalType
 from openlp.core.lib.ui import create_action
 from openlp.core.ui import AlertLocation
 from openlp.core.ui.icons import UiIcons
-from openlp.plugins.alerts.endpoint import api_alerts_endpoint, alerts_endpoint
+from openlp.plugins.alerts.endpoint import alerts_endpoint, api_alerts_endpoint
 from openlp.plugins.alerts.forms import AlertForm
 from openlp.plugins.alerts.lib import AlertsManager, AlertsTab
 from openlp.plugins.alerts.lib.db import init_schema
 
+
 log = logging.getLogger(__name__)
 
 JAVASCRIPT = """

openlp/plugins/alerts/endpoint.py

@@ -29,6 +29,7 @@ from openlp.core.api.http.endpoint import Endpoint
 from openlp.core.common.registry import Registry
 from openlp.core.lib.plugin import PluginStatus
 
+
 log = logging.getLogger(__name__)
 
 alerts_endpoint = Endpoint('alert')

openlp/plugins/alerts/forms/alertdialog.py

@@ -23,8 +23,8 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.lib.ui import create_button, create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_AlertDialog(object):

openlp/plugins/alerts/forms/alertform.py

@@ -25,6 +25,7 @@ from PyQt5 import QtCore, QtWidgets
 from openlp.core.common.i18n import translate
 from openlp.core.common.registry import Registry
 from openlp.plugins.alerts.lib.db import AlertItem
+
 from .alertdialog import Ui_AlertDialog
 
 

openlp/plugins/bibles/bibleplugin.py

@@ -25,15 +25,16 @@ import logging
 from openlp.core.api.http import register_endpoint
 from openlp.core.common.actions import ActionList
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.lib import build_icon
 from openlp.core.lib.plugin import Plugin, StringContent
 from openlp.core.lib.ui import create_action
+from openlp.core.ui.icons import UiIcons
 from openlp.plugins.bibles.endpoint import api_bibles_endpoint, bibles_endpoint
-from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \
+from openlp.plugins.bibles.lib import BibleManager, BibleMediaItem, BiblesTab, DisplayStyle, LanguageSelection, \
-    LanguageSelection
+    LayoutStyle
 from openlp.plugins.bibles.lib.mediaitem import BibleSearch
 
+
 log = logging.getLogger(__name__)
 
 

openlp/plugins/bibles/endpoint.py

@@ -21,11 +21,12 @@
 ###############################################################################
 import logging
 
-from openlp.core.api.endpoint.pluginhelpers import search, live, service
+from openlp.core.api.endpoint.pluginhelpers import live, search, service
 from openlp.core.api.http import requires_auth
 from openlp.core.api.http.endpoint import Endpoint
 from openlp.core.api.http.errors import NotFound
 
+
 log = logging.getLogger(__name__)
 
 bibles_endpoint = Endpoint('bibles')

openlp/plugins/bibles/forms/bibleimportform.py

@@ -25,18 +25,12 @@ The bible import functions for OpenLP
 import logging
 import urllib.error
 
-from PyQt5 import QtWidgets
 from lxml import etree
-
+from PyQt5 import QtWidgets
-try:
-    from pysword import modules
-    PYSWORD_AVAILABLE = True
-except:
-    PYSWORD_AVAILABLE = False
 
 from openlp.core.common import trace_error_handler
 from openlp.core.common.applocation import AppLocation
-from openlp.core.common.i18n import UiStrings, translate, get_locale_key
+from openlp.core.common.i18n import UiStrings, get_locale_key, translate
 from openlp.core.common.settings import Settings
 from openlp.core.lib.db import delete_database
 from openlp.core.lib.exceptions import ValidationError
@@ -44,9 +38,17 @@ from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.widgets.edits import PathEdit
 from openlp.core.widgets.wizard import OpenLPWizard, WizardStrings
 from openlp.plugins.bibles.lib.db import clean_filename
-from openlp.plugins.bibles.lib.importers.http import CWExtract, BGExtract, BSExtract
+from openlp.plugins.bibles.lib.importers.http import BGExtract, BSExtract, CWExtract
 from openlp.plugins.bibles.lib.manager import BibleFormat
 
+
+try:
+    from pysword import modules
+    PYSWORD_AVAILABLE = True
+except:
+    PYSWORD_AVAILABLE = False
+
+
 log = logging.getLogger(__name__)
 
 

openlp/plugins/bibles/forms/booknameform.py

@@ -35,6 +35,7 @@ from openlp.plugins.bibles.forms.booknamedialog import Ui_BookNameDialog
 from openlp.plugins.bibles.lib import BibleStrings
 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 
+
 log = logging.getLogger(__name__)
 
 

openlp/plugins/bibles/forms/editbibledialog.py

@@ -24,9 +24,9 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
 from openlp.core.lib.ui import create_button_box
-from openlp.plugins.bibles.lib import LanguageSelection, BibleStrings
-from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 from openlp.core.ui.icons import UiIcons
+from openlp.plugins.bibles.lib import BibleStrings, LanguageSelection
+from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 
 
 class Ui_EditBibleDialog(object):

openlp/plugins/bibles/forms/editbibleform.py

@@ -30,8 +30,10 @@ from openlp.core.common.mixins import RegistryProperties
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.bibles.lib import BibleStrings
 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
+
 from .editbibledialog import Ui_EditBibleDialog
 
+
 log = logging.getLogger(__name__)
 
 

openlp/plugins/bibles/forms/languageform.py

@@ -32,6 +32,7 @@ from openlp.core.common.i18n import LANGUAGES, translate
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.bibles.forms.languagedialog import Ui_LanguageDialog
 
+
 log = logging.getLogger(__name__)
 
 

openlp/plugins/bibles/lib/biblestab.py

@@ -29,8 +29,9 @@ from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.lib.settingstab import SettingsTab
 from openlp.core.lib.ui import find_and_set_in_combo_box
-from openlp.plugins.bibles.lib import LayoutStyle, DisplayStyle, update_reference_separators, \
+from openlp.plugins.bibles.lib import DisplayStyle, LanguageSelection, LayoutStyle, get_reference_separator, \
-    get_reference_separator, LanguageSelection
+    update_reference_separators
+
 
 log = logging.getLogger(__name__)
 

openlp/plugins/bibles/lib/db.py

@@ -20,14 +20,14 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import chardet
 import logging
 import re
 import sqlite3
 import time
 
+import chardet
 from PyQt5 import QtCore
-from sqlalchemy import Column, ForeignKey, Table, or_, types, func
+from sqlalchemy import Column, ForeignKey, Table, func, or_, types
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm import class_mapper, mapper, relation
 from sqlalchemy.orm.exc import UnmappedClassError
@@ -36,10 +36,11 @@ from openlp.core.common import clean_filename
 from openlp.core.common.applocation import AppLocation
 from openlp.core.common.i18n import translate
 from openlp.core.common.path import Path
-from openlp.core.lib.db import BaseModel, init_db, Manager
+from openlp.core.lib.db import BaseModel, Manager, init_db
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.bibles.lib import BibleStrings, LanguageSelection, upgrade
 
+
 log = logging.getLogger(__name__)
 
 RESERVED_CHARACTERS = '\\.^$*+?{}[]()'

openlp/plugins/bibles/lib/importers/csvbible.py

@@ -58,6 +58,7 @@ from openlp.core.common.path import Path
 from openlp.core.lib.exceptions import ValidationError
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 
+
 Book = namedtuple('Book', 'id, testament_id, name, abbreviation')
 Verse = namedtuple('Verse', 'book_id_name, chapter_number, number, text')
 

openlp/plugins/bibles/lib/importers/http.py

@@ -39,6 +39,7 @@ from openlp.plugins.bibles.lib import SearchResults
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB, Book
 
+
 CLEANER_REGEX = re.compile(r'&nbsp;|<br />|\'\+\'')
 FIX_PUNKCTUATION_REGEX = re.compile(r'[ ]+([.,;])')
 REDUCE_SPACES_REGEX = re.compile(r'[ ]{2,}')

openlp/plugins/bibles/lib/importers/osis.py

@@ -24,6 +24,7 @@ from lxml import etree
 
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 
+
 NS = {'ns': 'http://www.bibletechnologies.net/2003/OSIS/namespace'}
 # Tags we don't use and can remove the content
 REMOVABLE_ELEMENTS = (

openlp/plugins/bibles/lib/importers/sword.py

@@ -29,6 +29,7 @@ from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 
+
 log = logging.getLogger(__name__)
 
 

openlp/plugins/bibles/lib/importers/wordproject.py

@@ -24,11 +24,12 @@ import re
 from tempfile import TemporaryDirectory
 from zipfile import ZipFile
 
-from bs4 import BeautifulSoup, Tag, NavigableString
+from bs4 import BeautifulSoup, NavigableString, Tag
 
 from openlp.core.common.path import Path
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 
+
 BOOK_NUMBER_PATTERN = re.compile(r'\[(\d+)\]')
 REPLACE_SPACES = re.compile(r'\s{2,}')
 

openlp/plugins/bibles/lib/importers/zefania.py

@@ -27,6 +27,7 @@ from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 
+
 log = logging.getLogger(__name__)
 
 # Tags we don't use and can remove the content

openlp/plugins/bibles/lib/manager.py

@@ -29,6 +29,7 @@ from openlp.core.common.path import Path
 from openlp.core.common.settings import Settings
 from openlp.plugins.bibles.lib import LanguageSelection, parse_reference
 from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta
+
 from .importers.csvbible import CSVBible
 from .importers.http import HTTPBible
 from .importers.opensong import OpenSongBible
@@ -36,6 +37,7 @@ from .importers.osis import OSISBible
 from .importers.wordproject import WordProjectBible
 from .importers.zefania import ZefaniaBible
 
+
 try:
     from .importers.sword import SwordBible
 except:

openlp/plugins/bibles/lib/mediaitem.py

@@ -26,20 +26,21 @@ from enum import IntEnum, unique
 
 from PyQt5 import QtCore, QtWidgets
 
-from openlp.core.common.i18n import UiStrings, translate, get_locale_key
+from openlp.core.common.i18n import UiStrings, get_locale_key, translate
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.lib import ServiceItemContext
 from openlp.core.lib.mediamanageritem import MediaManagerItem
 from openlp.core.lib.serviceitem import ItemCapabilities
-from openlp.core.lib.ui import set_case_insensitive_completer, create_horizontal_adjusting_combo_box, \
+from openlp.core.lib.ui import create_horizontal_adjusting_combo_box, critical_error_message_box, \
-    critical_error_message_box, find_and_set_in_combo_box
+    find_and_set_in_combo_box, set_case_insensitive_completer
 from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.edits import SearchEdit
 from openlp.plugins.bibles.forms.bibleimportform import BibleImportForm
 from openlp.plugins.bibles.forms.editbibleform import EditBibleForm
-from openlp.plugins.bibles.lib import DisplayStyle, LayoutStyle, VerseReferenceList, \
+from openlp.plugins.bibles.lib import DisplayStyle, LayoutStyle, VerseReferenceList, get_reference_match, \
-    get_reference_match, get_reference_separator
+    get_reference_separator
+
 
 log = logging.getLogger(__name__)
 

openlp/plugins/bibles/lib/upgrade.py

@@ -24,6 +24,7 @@ The :mod:`upgrade` module provides a way for the database and schema that is the
 """
 import logging
 
+
 log = logging.getLogger(__name__)
 __version__ = 1
 

openlp/plugins/custom/customplugin.py

@@ -28,15 +28,16 @@ import logging
 
 from openlp.core.api.http import register_endpoint
 from openlp.core.common.i18n import translate
-from openlp.core.ui.icons import UiIcons
 from openlp.core.lib import build_icon
-from openlp.core.lib.plugin import Plugin, StringContent
 from openlp.core.lib.db import Manager
+from openlp.core.lib.plugin import Plugin, StringContent
+from openlp.core.ui.icons import UiIcons
 from openlp.plugins.custom.endpoint import api_custom_endpoint, custom_endpoint
 from openlp.plugins.custom.lib import CustomMediaItem, CustomTab
 from openlp.plugins.custom.lib.db import CustomSlide, init_schema
 from openlp.plugins.custom.lib.mediaitem import CustomSearch
 
+
 log = logging.getLogger(__name__)
 
 __default_settings__ = {