openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #32568
[Merge] lp:~trb143/openlp/textcleanups into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/textcleanups into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/textcleanups/+merge/335600
Update the year to 2018
Add some missing copyright files
Reorder and fix the imports for all files.
Fix a timing issue with the mac build which makes it fail all the time.
lp:~trb143/openlp/textcleanups (revision 2811)
https://ci.openlp.io/job/Branch-01-Pull/2405/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2306/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/101/ [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/25/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/24/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1487/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1300/ [SUCCESS]
--
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/textcleanups into lp:openlp.
=== modified file 'copyright.txt'
--- copyright.txt 2016-12-31 11:01:36 +0000
+++ copyright.txt 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp.py'
--- openlp.py 2017-12-17 04:29:53 +0000
+++ openlp.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/__init__.py'
--- openlp/__init__.py 2017-10-10 07:08:44 +0000
+++ openlp/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py 2017-10-10 07:08:44 +0000
+++ openlp/core/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/api/__init__.py'
--- openlp/core/api/__init__.py 2017-03-04 19:17:59 +0000
+++ openlp/core/api/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,9 +20,9 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+from openlp.core.api.http import register_endpoint, requires_auth
from openlp.core.api.http.endpoint import Endpoint
-from openlp.core.api.http import register_endpoint, requires_auth
+from openlp.core.api.poll import Poller
from openlp.core.api.tab import ApiTab
-from openlp.core.api.poll import Poller
__all__ = ['Endpoint', 'ApiTab', 'register_endpoint', 'requires_auth']
=== modified file 'openlp/core/api/deploy.py'
--- openlp/core/api/deploy.py 2017-12-02 21:47:11 +0000
+++ openlp/core/api/deploy.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,8 +25,8 @@
from zipfile import ZipFile
from openlp.core.common.applocation import AppLocation
+from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size
from openlp.core.common.registry import Registry
-from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size
def deploy_zipfile(app_root_path, zip_name):
=== modified file 'openlp/core/api/endpoint/__init__.py'
--- openlp/core/api/endpoint/__init__.py 2017-03-04 19:17:59 +0000
+++ openlp/core/api/endpoint/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/api/endpoint/controller.py'
--- openlp/core/api/endpoint/controller.py 2017-11-18 11:23:15 +0000
+++ openlp/core/api/endpoint/controller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,14 +19,14 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import json
import logging
import os
+import urllib.error
import urllib.request
-import urllib.error
-import json
+from openlp.core.api.http import requires_auth
from openlp.core.api.http.endpoint import Endpoint
-from openlp.core.api.http import requires_auth
from openlp.core.common.applocation import AppLocation
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
=== modified file 'openlp/core/api/endpoint/core.py'
--- openlp/core/api/endpoint/core.py 2017-11-18 22:37:24 +0000
+++ openlp/core/api/endpoint/core.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,11 +27,10 @@
from openlp.core.api.http import requires_auth
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.common.i18n import UiStrings, translate
from openlp.core.lib import PluginStatus, StringContent, image_to_byte
-
template_dir = 'templates'
static_dir = 'static'
blank_dir = os.path.join(static_dir, 'index')
=== modified file 'openlp/core/api/endpoint/pluginhelpers.py'
--- openlp/core/api/endpoint/pluginhelpers.py 2017-11-18 11:23:15 +0000
+++ openlp/core/api/endpoint/pluginhelpers.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/api/endpoint/remote.py'
--- openlp/core/api/endpoint/remote.py 2017-11-09 19:25:26 +0000
+++ openlp/core/api/endpoint/remote.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,9 +21,8 @@
###############################################################################
import logging
+from openlp.core.api.endpoint.core import TRANSLATED_STRINGS
from openlp.core.api.http.endpoint import Endpoint
-from openlp.core.api.endpoint.core import TRANSLATED_STRINGS
-
log = logging.getLogger(__name__)
=== modified file 'openlp/core/api/endpoint/service.py'
--- openlp/core/api/endpoint/service.py 2017-10-07 07:05:07 +0000
+++ openlp/core/api/endpoint/service.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,14 +19,13 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import json
import logging
-import json
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')
=== modified file 'openlp/core/api/http/__init__.py'
--- openlp/core/api/http/__init__.py 2017-03-04 19:17:59 +0000
+++ openlp/core/api/http/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,10 +22,11 @@
import base64
from functools import wraps
+
from webob import Response
+from openlp.core.api.http.wsgiapp import WSGIApplication
from openlp.core.common.settings import Settings
-from openlp.core.api.http.wsgiapp import WSGIApplication
from .errors import NotFound, ServerError, HttpError
application = WSGIApplication('api')
=== modified file 'openlp/core/api/http/endpoint.py'
--- openlp/core/api/http/endpoint.py 2017-11-18 11:23:15 +0000
+++ openlp/core/api/http/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/api/http/errors.py'
--- openlp/core/api/http/errors.py 2017-03-04 19:17:59 +0000
+++ openlp/core/api/http/errors.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/api/http/server.py'
--- openlp/core/api/http/server.py 2017-12-02 21:47:11 +0000
+++ openlp/core/api/http/server.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -32,18 +32,18 @@
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.core import chords_endpoint, stage_endpoint, blank_endpoint, main_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.remote import remote_endpoint
+from openlp.core.api.http import application
from openlp.core.api.http import register_endpoint
-from openlp.core.api.http import application
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 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.common.i18n import translate
log = logging.getLogger(__name__)
=== modified file 'openlp/core/api/http/wsgiapp.py'
--- openlp/core/api/http/wsgiapp.py 2017-11-18 11:23:15 +0000
+++ openlp/core/api/http/wsgiapp.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,9 +30,8 @@
from webob import Request, Response
from webob.static import DirectoryApp
+from openlp.core.api.http.errors import HttpError, NotFound, ServerError
from openlp.core.common.applocation import AppLocation
-from openlp.core.api.http.errors import HttpError, NotFound, ServerError
-
ARGS_REGEX = re.compile(r'''\{(\w+)(?::([^}]+))?\}''', re.VERBOSE)
=== modified file 'openlp/core/api/poll.py'
--- openlp/core/api/poll.py 2017-10-23 22:09:57 +0000
+++ openlp/core/api/poll.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/api/tab.py'
--- openlp/core/api/tab.py 2017-10-10 02:29:56 +0000
+++ openlp/core/api/tab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/api/websockets.py'
--- openlp/core/api/websockets.py 2017-12-02 09:11:22 +0000
+++ openlp/core/api/websockets.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,11 +24,11 @@
with OpenLP. It uses JSON to communicate with the remotes.
"""
import asyncio
-import websockets
import json
import logging
import time
+import websockets
from PyQt5 import QtCore
from openlp.core.common.mixins import LogMixin, RegistryProperties
=== modified file 'openlp/core/app.py'
--- openlp/core/app.py 2017-12-02 21:47:11 +0000
+++ openlp/core/app.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -42,7 +42,6 @@
from openlp.core.common.path import create_paths, copytree
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.version import check_for_update, get_version
from openlp.core.display.screens import ScreenList
from openlp.core.resources import qInitResources
from openlp.core.ui import SplashScreen
@@ -51,7 +50,7 @@
from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
from openlp.core.ui.mainwindow import MainWindow
from openlp.core.ui.style import get_application_stylesheet
-
+from openlp.core.version import check_for_update, get_version
__all__ = ['OpenLP', 'main']
=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py 2017-12-17 15:25:54 +0000
+++ openlp/core/common/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,13 +30,13 @@
import re
import sys
import traceback
-from chardet.universaldetector import UniversalDetector
from ipaddress import IPv4Address, IPv6Address, AddressValueError
from shutil import which
from subprocess import check_output, CalledProcessError, STDOUT
from PyQt5 import QtGui
from PyQt5.QtCore import QCryptographicHash as QHash
+from chardet.universaldetector import UniversalDetector
log = logging.getLogger(__name__ + '.__init__')
=== modified file 'openlp/core/common/actions.py'
--- openlp/core/common/actions.py 2017-11-09 19:11:37 +0000
+++ openlp/core/common/actions.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.settings import Settings
-
log = logging.getLogger(__name__)
=== modified file 'openlp/core/common/applocation.py'
--- openlp/core/common/applocation.py 2017-11-11 12:20:45 +0000
+++ openlp/core/common/applocation.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/common/db.py'
--- openlp/core/common/db.py 2016-12-31 11:01:36 +0000
+++ openlp/core/common/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
import sqlalchemy
-
log = logging.getLogger(__name__)
=== modified file 'openlp/core/common/httputils.py'
--- openlp/core/common/httputils.py 2017-11-03 20:55:41 +0000
+++ openlp/core/common/httputils.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/common/i18n.py'
--- openlp/core/common/i18n.py 2017-10-28 10:04:09 +0000
+++ openlp/core/common/i18n.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/common/json.py'
--- openlp/core/common/json.py 2017-09-07 20:27:11 +0000
+++ openlp/core/common/json.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/common/mixins.py'
--- openlp/core/common/mixins.py 2017-11-10 04:11:03 +0000
+++ openlp/core/common/mixins.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,8 +22,8 @@
"""
Provide Error Handling and login Services
"""
+import inspect
import logging
-import inspect
from openlp.core.common import is_win, trace_error_handler
from openlp.core.common.registry import Registry
=== modified file 'openlp/core/common/path.py'
--- openlp/core/common/path.py 2017-11-20 21:57:34 +0000
+++ openlp/core/common/path.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/common/registry.py'
--- openlp/core/common/registry.py 2017-11-09 21:24:38 +0000
+++ openlp/core/common/registry.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2017-12-02 21:47:11 +0000
+++ openlp/core/common/settings.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,8 +23,8 @@
This class contains the core default settings.
"""
import datetime
+import json
import logging
-import json
import os
from tempfile import gettempdir
=== modified file 'openlp/core/display/__init__.py'
--- openlp/core/display/__init__.py 2017-10-10 07:08:44 +0000
+++ openlp/core/display/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/display/renderer.py'
--- openlp/core/display/renderer.py 2017-11-18 11:23:15 +0000
+++ openlp/core/display/renderer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,10 +21,11 @@
###############################################################################
import re
-
from string import Template
+
from PyQt5 import QtGui, QtCore, QtWebKitWidgets
+from openlp.core.common import ThemeLevel
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.path import path_to_str
from openlp.core.common.registry import Registry, RegistryBase
@@ -32,7 +33,6 @@
from openlp.core.display.screens import ScreenList
from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, ServiceItem, expand_tags, build_chords_css, \
build_lyrics_format_css, build_lyrics_outline_css
-from openlp.core.common import ThemeLevel
from openlp.core.ui.maindisplay import MainDisplay
VERSE = 'The Lord said to {r}Noah{/r}: \n' \
=== modified file 'openlp/core/display/screens.py'
--- openlp/core/display/screens.py 2017-10-10 07:08:44 +0000
+++ openlp/core/display/screens.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,14 +23,14 @@
The :mod:`screen` module provides management functionality for a machines'
displays.
"""
+import copy
import logging
-import copy
from PyQt5 import QtCore
+from openlp.core.common.i18n import translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.common.i18n import translate
log = logging.getLogger(__name__)
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2017-12-20 08:15:53 +0000
+++ openlp/core/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,8 +25,8 @@
"""
import html
import logging
+import math
import re
-import math
from PyQt5 import QtCore, QtGui, QtWidgets
=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py 2017-10-23 22:09:57 +0000
+++ openlp/core/lib/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/lib/exceptions.py'
--- openlp/core/lib/exceptions.py 2017-05-30 18:42:35 +0000
+++ openlp/core/lib/exceptions.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/lib/formattingtags.py'
--- openlp/core/lib/formattingtags.py 2017-10-07 07:05:07 +0000
+++ openlp/core/lib/formattingtags.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,8 +24,8 @@
"""
import json
+from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
-from openlp.core.common.i18n import translate
class FormattingTags(object):
=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py 2017-10-07 07:05:07 +0000
+++ openlp/core/lib/htmlbuilder.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -407,8 +407,8 @@
</html>
"""
import logging
-
from string import Template
+
from PyQt5 import QtWebKit
from openlp.core.common.settings import Settings
=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py 2017-10-10 07:08:44 +0000
+++ openlp/core/lib/imagemanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,8 +26,8 @@
"""
import logging
import os
+import queue
import time
-import queue
from PyQt5 import QtCore
=== modified file 'openlp/core/lib/json/__init__.py'
--- openlp/core/lib/json/__init__.py 2017-10-23 22:09:57 +0000
+++ openlp/core/lib/json/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2017-12-22 21:21:39 +0000
+++ openlp/core/lib/mediamanageritem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,8 +28,8 @@
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.i18n import UiStrings, translate
+from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import path_to_str, str_to_path
-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 ServiceItem, StringContent, ServiceItemContext
=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py 2017-11-18 11:23:15 +0000
+++ openlp/core/lib/plugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2017-12-17 15:25:54 +0000
+++ openlp/core/lib/pluginmanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2017-10-23 22:09:57 +0000
+++ openlp/core/lib/serviceitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,9 +26,9 @@
import datetime
import html
import logging
+import ntpath
import os
import uuid
-import ntpath
from PyQt5 import QtGui
=== modified file 'openlp/core/lib/settingstab.py'
--- openlp/core/lib/settingstab.py 2017-10-23 22:09:57 +0000
+++ openlp/core/lib/settingstab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2017-10-10 07:08:44 +0000
+++ openlp/core/lib/theme.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2017-10-07 07:05:07 +0000
+++ openlp/core/lib/ui.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -32,7 +32,6 @@
from openlp.core.common.registry import Registry
from openlp.core.lib import build_icon
-
log = logging.getLogger(__name__)
=== modified file 'openlp/core/projectors/__init__.py'
--- openlp/core/projectors/__init__.py 2017-12-04 00:24:47 +0000
+++ openlp/core/projectors/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/projectors/constants.py'
--- openlp/core/projectors/constants.py 2017-12-09 11:17:05 +0000
+++ openlp/core/projectors/constants.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/projectors/db.py'
--- openlp/core/projectors/db.py 2017-12-04 00:24:47 +0000
+++ openlp/core/projectors/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/projectors/editform.py'
--- openlp/core/projectors/editform.py 2017-11-10 11:59:38 +0000
+++ openlp/core/projectors/editform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,8 +30,8 @@
from openlp.core.common import verify_ip_address
from openlp.core.common.i18n import translate
from openlp.core.lib import build_icon
+from openlp.core.projectors.constants import PJLINK_PORT
from openlp.core.projectors.db import Projector
-from openlp.core.projectors.constants import PJLINK_PORT
log = logging.getLogger(__name__)
log.debug('editform loaded')
=== modified file 'openlp/core/projectors/manager.py'
--- openlp/core/projectors/manager.py 2017-11-24 19:08:23 +0000
+++ openlp/core/projectors/manager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -39,8 +39,8 @@
E_NETWORK, E_NOT_CONNECTED, E_UNKNOWN_SOCKET_ERROR, STATUS_STRING, S_CONNECTED, S_CONNECTING, S_COOLDOWN, \
S_INITIALIZE, S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP
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.editform import ProjectorEditForm
from openlp.core.projectors.sourceselectform import SourceSelectTabs, SourceSelectSingle
from openlp.core.widgets.toolbar import OpenLPToolbar
=== modified file 'openlp/core/projectors/pjlink.py'
--- openlp/core/projectors/pjlink.py 2017-12-09 11:17:05 +0000
+++ openlp/core/projectors/pjlink.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/projectors/sourceselectform.py'
--- openlp/core/projectors/sourceselectform.py 2017-11-10 11:59:38 +0000
+++ openlp/core/projectors/sourceselectform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -31,8 +31,8 @@
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.db import ProjectorSource
-from openlp.core.projectors.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES
log = logging.getLogger(__name__)
=== modified file 'openlp/core/projectors/tab.py'
--- openlp/core/projectors/tab.py 2017-11-10 11:59:38 +0000
+++ openlp/core/projectors/tab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/projectors/upgrade.py'
--- openlp/core/projectors/upgrade.py 2017-11-10 11:59:38 +0000
+++ openlp/core/projectors/upgrade.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/resources.py'
--- openlp/core/resources.py 2017-10-01 07:45:53 +0000
+++ openlp/core/resources.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/threading.py'
--- openlp/core/threading.py 2017-09-09 05:57:06 +0000
+++ openlp/core/threading.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2017-11-16 23:53:53 +0000
+++ openlp/core/ui/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/aboutdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/aboutform.py'
--- openlp/core/ui/aboutform.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/aboutform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,8 +26,8 @@
from PyQt5 import QtCore, QtWidgets
+from openlp.core.common.i18n import translate
from openlp.core.version import get_version
-from openlp.core.common.i18n import translate
from .aboutdialog import UiAboutDialog
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/advancedtab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/exceptiondialog.py'
--- openlp/core/ui/exceptiondialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/exceptiondialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2017-11-03 20:55:41 +0000
+++ openlp/core/ui/exceptionform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/filerenamedialog.py'
--- openlp/core/ui/filerenamedialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/filerenamedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/filerenameform.py'
--- openlp/core/ui/filerenameform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/filerenameform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2017-12-17 04:29:53 +0000
+++ openlp/core/ui/firsttimeform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,9 +26,9 @@
import os
import socket
import time
+import urllib.error
+import urllib.parse
import urllib.request
-import urllib.parse
-import urllib.error
from configparser import ConfigParser, MissingSectionHeaderError, NoOptionError, NoSectionError
from tempfile import gettempdir
@@ -36,14 +36,14 @@
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, url_get_file, CONNECTION_TIMEOUT
from openlp.core.common.i18n import translate
+from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import Path, create_paths
-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 PluginStatus, build_icon
from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.common.httputils import get_web_page, get_url_file_size, url_get_file, CONNECTION_TIMEOUT
from .firsttimewizard import UiFirstTimeWizard, FirstTimePage
log = logging.getLogger(__name__)
=== modified file 'openlp/core/ui/firsttimelanguagedialog.py'
--- openlp/core/ui/firsttimelanguagedialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/firsttimelanguagedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/firsttimelanguageform.py'
--- openlp/core/ui/firsttimelanguageform.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/firsttimelanguageform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2017-11-16 23:53:53 +0000
+++ openlp/core/ui/firsttimewizard.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/formattingtagcontroller.py'
--- openlp/core/ui/formattingtagcontroller.py 2017-10-28 10:04:09 +0000
+++ openlp/core/ui/formattingtagcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/formattingtagdialog.py'
--- openlp/core/ui/formattingtagdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/formattingtagdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/formattingtagform.py'
--- openlp/core/ui/formattingtagform.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/formattingtagform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,8 +28,8 @@
from openlp.core.common.i18n import translate
from openlp.core.lib import FormattingTags
+from openlp.core.ui.formattingtagcontroller import FormattingTagController
from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog
-from openlp.core.ui.formattingtagcontroller import FormattingTagController
class EditColumn(object):
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/generaltab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2017-11-18 22:37:24 +0000
+++ openlp/core/ui/maindisplay.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2017-12-02 09:11:22 +0000
+++ openlp/core/ui/mainwindow.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,8 +23,6 @@
This is the main window, where all the action happens.
"""
import logging
-import os
-import shutil
import sys
import time
from datetime import datetime
@@ -40,25 +38,24 @@
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.common.mixins import RegistryProperties
from openlp.core.common.path import Path, copyfile, create_paths
-from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
+from openlp.core.display.renderer import Renderer
from openlp.core.display.screens import ScreenList
-from openlp.core.display.renderer import Renderer
from openlp.core.lib import PluginManager, ImageManager, PluginStatus, build_icon
from openlp.core.lib.ui import create_action
from openlp.core.projectors.manager import ProjectorManager
from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, LiveController, PluginForm, \
ShortcutListForm, FormattingTagForm, PreviewController
from openlp.core.ui.firsttimeform import FirstTimeForm
-from openlp.core.widgets.dialogs import FileDialog
-from openlp.core.widgets.docks import OpenLPDockWidget, MediaDockManager
from openlp.core.ui.media import MediaController
from openlp.core.ui.printserviceform import PrintServiceForm
from openlp.core.ui.style import PROGRESSBAR_STYLE, get_library_stylesheet
from openlp.core.version import get_version
-
+from openlp.core.widgets.dialogs import FileDialog
+from openlp.core.widgets.docks import OpenLPDockWidget, MediaDockManager
log = logging.getLogger(__name__)
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/media/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/media/endpoint.py'
--- openlp/core/ui/media/endpoint.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/media/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,8 +24,8 @@
"""
import logging
+from openlp.core.api.http import requires_auth
from openlp.core.api.http.endpoint import Endpoint
-from openlp.core.api.http import requires_auth
from openlp.core.common.registry import Registry
log = logging.getLogger(__name__)
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2017-12-17 15:25:54 +0000
+++ openlp/core/ui/media/mediacontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,9 +23,10 @@
The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets
related to playing media, such as sliders.
"""
+import datetime
import logging
import os
-import datetime
+
from PyQt5 import QtCore, QtWidgets
from openlp.core.api.http import register_endpoint
@@ -37,14 +38,13 @@
from openlp.core.lib import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
+from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \
+ parse_optical_path
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.ui.media.mediaplayer import MediaPlayer
-from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players,\
- parse_optical_path
from openlp.core.widgets.toolbar import OpenLPToolbar
-
log = logging.getLogger(__name__)
TICK_TIME = 200
=== modified file 'openlp/core/ui/media/mediaplayer.py'
--- openlp/core/ui/media/mediaplayer.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/media/mediaplayer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/media/playertab.py'
--- openlp/core/ui/media/playertab.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/media/playertab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/media/systemplayer.py'
--- openlp/core/ui/media/systemplayer.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/media/systemplayer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -32,7 +32,6 @@
from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer
-
log = logging.getLogger(__name__)
ADDITIONAL_EXT = {
=== modified file 'openlp/core/ui/media/vendor/__init__.py'
--- openlp/core/ui/media/vendor/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/core/ui/media/vendor/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/media/vendor/mediainfoWrapper.py'
--- openlp/core/ui/media/vendor/mediainfoWrapper.py 2017-11-16 17:43:17 +0000
+++ openlp/core/ui/media/vendor/mediainfoWrapper.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/media/vendor/vlc.py'
--- openlp/core/ui/media/vendor/vlc.py 2016-01-25 18:14:03 +0000
+++ openlp/core/ui/media/vendor/vlc.py 2017-12-29 10:10:27 +0000
@@ -40,11 +40,10 @@
"""
import ctypes
-from ctypes.util import find_library
+import functools
import os
import sys
-import functools
-
+from ctypes.util import find_library
# Used by EventManager in override.py
from inspect import getargspec
=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py 2017-12-04 20:49:59 +0000
+++ openlp/core/ui/media/vlcplayer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,13 +22,14 @@
"""
The :mod:`~openlp.core.ui.media.vlcplayer` module contains our VLC component wrapper
"""
-from datetime import datetime
-from distutils.version import LooseVersion
+import ctypes
import logging
import os
+import sys
import threading
-import sys
-import ctypes
+from datetime import datetime
+from distutils.version import LooseVersion
+
from PyQt5 import QtWidgets
from openlp.core.common import is_win, is_macosx, is_linux
=== modified file 'openlp/core/ui/media/webkitplayer.py'
--- openlp/core/ui/media/webkitplayer.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/media/webkitplayer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,8 +26,8 @@
from PyQt5 import QtGui, QtWebKitWidgets
+from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
-from openlp.core.common.i18n import translate
from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer
=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/plugindialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/pluginform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/printservicedialog.py'
--- openlp/core/ui/printservicedialog.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/printservicedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/printserviceform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,8 +24,8 @@
"""
import datetime
import html
+
import lxml.html
-
from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport
from openlp.core.common.applocation import AppLocation
=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
--- openlp/core/ui/serviceitemeditdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/serviceitemeditdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/serviceitemeditform.py'
--- openlp/core/ui/serviceitemeditform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/serviceitemeditform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2017-12-22 21:21:39 +0000
+++ openlp/core/ui/servicemanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/servicenoteform.py'
--- openlp/core/ui/servicenoteform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/servicenoteform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/settingsdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py 2017-11-16 23:53:53 +0000
+++ openlp/core/ui/settingsform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/shortcutlistdialog.py'
--- openlp/core/ui/shortcutlistdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/shortcutlistdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/shortcutlistform.py'
--- openlp/core/ui/shortcutlistform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/shortcutlistform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2017-11-09 19:55:01 +0000
+++ openlp/core/ui/slidecontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -42,7 +42,6 @@
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); ' \
=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py 2016-12-31 11:01:36 +0000
+++ openlp/core/ui/splashscreen.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/starttimedialog.py'
--- openlp/core/ui/starttimedialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/starttimedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/starttimeform.py'
--- openlp/core/ui/starttimeform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/starttimeform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/style.py'
--- openlp/core/ui/style.py 2017-09-29 03:06:00 +0000
+++ openlp/core/ui/style.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,7 +24,7 @@
"""
from PyQt5 import QtGui
-from openlp.core.common import is_macosx, is_win
+from openlp.core.common import is_win
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/themeform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/themelayoutdialog.py'
--- openlp/core/ui/themelayoutdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/themelayoutdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/themelayoutform.py'
--- openlp/core/ui/themelayoutform.py 2016-12-31 11:01:36 +0000
+++ openlp/core/ui/themelayoutform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2017-11-20 21:57:34 +0000
+++ openlp/core/ui/thememanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py 2017-10-07 07:05:07 +0000
+++ openlp/core/ui/themestab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py 2017-10-23 22:09:57 +0000
+++ openlp/core/ui/themewizard.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/version.py'
--- openlp/core/version.py 2017-11-18 11:23:15 +0000
+++ openlp/core/version.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/__init__.py'
--- openlp/core/widgets/__init__.py 2017-10-23 22:09:57 +0000
+++ openlp/core/widgets/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/buttons.py'
--- openlp/core/widgets/buttons.py 2017-10-23 22:09:57 +0000
+++ openlp/core/widgets/buttons.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/dialogs.py'
--- openlp/core/widgets/dialogs.py 2017-10-23 22:09:57 +0000
+++ openlp/core/widgets/dialogs.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,7 +22,7 @@
""" Patch the QFileDialog so it accepts and returns Path objects"""
from PyQt5 import QtWidgets
-from openlp.core.common.path import Path, path_to_str, replace_params, str_to_path
+from openlp.core.common.path import path_to_str, replace_params, str_to_path
class FileDialog(QtWidgets.QFileDialog):
=== modified file 'openlp/core/widgets/docks.py'
--- openlp/core/widgets/docks.py 2017-10-23 22:09:57 +0000
+++ openlp/core/widgets/docks.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/edits.py'
--- openlp/core/widgets/edits.py 2017-11-11 12:20:45 +0000
+++ openlp/core/widgets/edits.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/enums.py'
--- openlp/core/widgets/enums.py 2017-10-23 22:09:57 +0000
+++ openlp/core/widgets/enums.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/toolbar.py'
--- openlp/core/widgets/toolbar.py 2017-10-23 22:09:57 +0000
+++ openlp/core/widgets/toolbar.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/views.py'
--- openlp/core/widgets/views.py 2017-12-17 04:29:53 +0000
+++ openlp/core/widgets/views.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/core/widgets/wizard.py'
--- openlp/core/widgets/wizard.py 2017-10-23 22:09:57 +0000
+++ openlp/core/widgets/wizard.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/__init__.py'
--- openlp/plugins/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/__init__.py'
--- openlp/plugins/alerts/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/alerts/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/endpoint.py'
--- openlp/plugins/alerts/endpoint.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/alerts/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,17 +19,16 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import json
import logging
-import json
import urllib
from urllib.parse import urlparse
+from openlp.core.api.http import requires_auth
from openlp.core.api.http.endpoint import Endpoint
-from openlp.core.api.http import requires_auth
from openlp.core.common.registry import Registry
from openlp.core.lib import PluginStatus
-
log = logging.getLogger(__name__)
alerts_endpoint = Endpoint('alert')
=== modified file 'openlp/plugins/alerts/forms/__init__.py'
--- openlp/plugins/alerts/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/alerts/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/forms/alertform.py'
--- openlp/plugins/alerts/forms/alertform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/alerts/forms/alertform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,7 +25,6 @@
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
=== modified file 'openlp/plugins/alerts/lib/__init__.py'
--- openlp/plugins/alerts/lib/__init__.py 2017-03-03 19:27:31 +0000
+++ openlp/plugins/alerts/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
--- openlp/plugins/alerts/lib/alertsmanager.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/alerts/lib/alertsmanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/alerts/lib/db.py'
--- openlp/plugins/alerts/lib/db.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/alerts/lib/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/__init__.py'
--- openlp/plugins/bibles/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/bibles/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,11 +23,11 @@
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.common.actions import ActionList
from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib.ui import create_action
from openlp.plugins.bibles.endpoint import api_bibles_endpoint, bibles_endpoint
-from openlp.core.lib.ui import create_action
from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \
LanguageSelection
from openlp.plugins.bibles.lib.mediaitem import BibleSearch
=== modified file 'openlp/plugins/bibles/endpoint.py'
--- openlp/plugins/bibles/endpoint.py 2017-09-26 17:21:54 +0000
+++ openlp/plugins/bibles/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,11 +21,10 @@
###############################################################################
import logging
+from openlp.core.api.endpoint.pluginhelpers import search, live, 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
-from openlp.core.api.endpoint.pluginhelpers import search, live, service
-from openlp.core.api.http import requires_auth
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/bibles/forms/__init__.py'
--- openlp/plugins/bibles/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/bibles/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,9 +24,9 @@
The :mod:`forms` module contains all the ui functionality for the bibles
plugin.
"""
+from .bibleimportform import BibleImportForm
from .booknameform import BookNameForm
+from .editbibleform import EditBibleForm
from .languageform import LanguageForm
-from .bibleimportform import BibleImportForm
-from .editbibleform import EditBibleForm
__all__ = ['BookNameForm', 'LanguageForm', 'BibleImportForm', 'EditBibleForm']
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py 2017-12-17 15:23:38 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,9 +24,10 @@
"""
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
=== modified file 'openlp/plugins/bibles/forms/booknamedialog.py'
--- openlp/plugins/bibles/forms/booknamedialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/bibles/forms/booknamedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/forms/booknameform.py'
--- openlp/plugins/bibles/forms/booknameform.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/bibles/forms/booknameform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,8 +26,8 @@
import logging
import re
+from PyQt5 import QtCore
from PyQt5.QtWidgets import QDialog
-from PyQt5 import QtCore
from openlp.core.common.i18n import translate
from openlp.core.lib.ui import critical_error_message_box
=== modified file 'openlp/plugins/bibles/forms/editbibledialog.py'
--- openlp/plugins/bibles/forms/editbibledialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/bibles/forms/editbibledialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/forms/editbibleform.py'
--- openlp/plugins/bibles/forms/editbibleform.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/bibles/forms/editbibleform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,9 +28,9 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.mixins import RegistryProperties
from openlp.core.lib.ui import critical_error_message_box
-from .editbibledialog import Ui_EditBibleDialog
from openlp.plugins.bibles.lib import BibleStrings
from openlp.plugins.bibles.lib.db import BiblesResourcesDB
+from .editbibledialog import Ui_EditBibleDialog
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/bibles/forms/languagedialog.py'
--- openlp/plugins/bibles/forms/languagedialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/bibles/forms/languagedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/forms/languageform.py'
--- openlp/plugins/bibles/forms/languageform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/bibles/forms/languageform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,14 +25,13 @@
"""
import logging
+from PyQt5 import QtCore
from PyQt5.QtWidgets import QDialog
-from PyQt5 import QtCore
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__)
=== modified file 'openlp/plugins/bibles/lib/__init__.py'
--- openlp/plugins/bibles/lib/__init__.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/bibles/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/bibles/lib/bibleimport.py'
--- openlp/plugins/bibles/lib/bibleimport.py 2017-11-06 22:41:36 +0000
+++ openlp/plugins/bibles/lib/bibleimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,12 +20,13 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+from zipfile import is_zipfile
+
from lxml import etree, objectify
-from zipfile import is_zipfile
+from openlp.core.common.i18n import get_language, translate
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.registry import Registry
-from openlp.core.common.i18n import get_language, translate
from openlp.core.lib import ValidationError
from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.bibles.lib.db import AlternativeBookNamesDB, BibleDB, BiblesResourcesDB
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2017-10-10 19:17:48 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py 2017-11-11 12:20:45 +0000
+++ openlp/plugins/bibles/lib/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,9 +19,9 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+
import chardet
import logging
-import os
import re
import sqlite3
import time
=== modified file 'openlp/plugins/bibles/lib/importers/__init__.py'
--- openlp/plugins/bibles/lib/importers/__init__.py 2017-10-10 21:16:04 +0000
+++ openlp/plugins/bibles/lib/importers/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/importers/csvbible.py'
--- openlp/plugins/bibles/lib/importers/csvbible.py 2017-10-10 19:17:48 +0000
+++ openlp/plugins/bibles/lib/importers/csvbible.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/importers/http.py'
--- openlp/plugins/bibles/lib/importers/http.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/bibles/lib/importers/http.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,8 +25,8 @@
import logging
import re
import socket
+import urllib.error
import urllib.parse
-import urllib.error
from bs4 import BeautifulSoup, NavigableString, Tag
=== modified file 'openlp/plugins/bibles/lib/importers/opensong.py'
--- openlp/plugins/bibles/lib/importers/opensong.py 2017-10-10 19:09:20 +0000
+++ openlp/plugins/bibles/lib/importers/opensong.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/importers/osis.py'
--- openlp/plugins/bibles/lib/importers/osis.py 2017-10-10 19:09:20 +0000
+++ openlp/plugins/bibles/lib/importers/osis.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/importers/sword.py'
--- openlp/plugins/bibles/lib/importers/sword.py 2017-10-10 19:17:48 +0000
+++ openlp/plugins/bibles/lib/importers/sword.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,6 +21,7 @@
###############################################################################
import logging
+
from pysword import modules
from openlp.core.common.i18n import translate
@@ -28,7 +29,6 @@
from openlp.plugins.bibles.lib.bibleimport import BibleImport
from openlp.plugins.bibles.lib.db import BiblesResourcesDB
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/bibles/lib/importers/wordproject.py'
--- openlp/plugins/bibles/lib/importers/wordproject.py 2017-10-10 19:09:20 +0000
+++ openlp/plugins/bibles/lib/importers/wordproject.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/importers/zefania.py'
--- openlp/plugins/bibles/lib/importers/zefania.py 2017-10-10 19:17:48 +0000
+++ openlp/plugins/bibles/lib/importers/zefania.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
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
=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py 2017-11-06 22:41:36 +0000
+++ openlp/plugins/bibles/lib/manager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -33,8 +33,9 @@
from .importers.http import HTTPBible
from .importers.opensong import OpenSongBible
from .importers.osis import OSISBible
+from .importers.wordproject import WordProjectBible
from .importers.zefania import ZefaniaBible
-from .importers.wordproject import WordProjectBible
+
try:
from .importers.sword import SwordBible
except:
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/upgrade.py'
--- openlp/plugins/bibles/lib/upgrade.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/bibles/lib/upgrade.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/bibles/lib/versereferencelist.py'
--- openlp/plugins/bibles/lib/versereferencelist.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/bibles/lib/versereferencelist.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/__init__.py'
--- openlp/plugins/custom/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/custom/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/custom/customplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/endpoint.py'
--- openlp/plugins/custom/endpoint.py 2017-09-26 17:21:54 +0000
+++ openlp/plugins/custom/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,11 +21,10 @@
###############################################################################
import logging
+from openlp.core.api.endpoint.pluginhelpers import search, live, 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
-from openlp.core.api.endpoint.pluginhelpers import search, live, service
-from openlp.core.api.http import requires_auth
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/custom/forms/__init__.py'
--- openlp/plugins/custom/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/custom/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/custom/forms/editcustomform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py'
--- openlp/plugins/custom/forms/editcustomslidedialog.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/custom/forms/editcustomslidedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/forms/editcustomslideform.py'
--- openlp/plugins/custom/forms/editcustomslideform.py 2017-06-04 12:14:23 +0000
+++ openlp/plugins/custom/forms/editcustomslideform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/lib/__init__.py'
--- openlp/plugins/custom/lib/__init__.py 2017-03-03 19:27:31 +0000
+++ openlp/plugins/custom/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,6 +20,6 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+from .customtab import CustomTab
from .customxmlhandler import CustomXMLBuilder, CustomXMLParser
from .mediaitem import CustomMediaItem
-from .customtab import CustomTab
=== modified file 'openlp/plugins/custom/lib/customtab.py'
--- openlp/plugins/custom/lib/customtab.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/custom/lib/customtab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/lib/customxmlhandler.py'
--- openlp/plugins/custom/lib/customxmlhandler.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/custom/lib/customxmlhandler.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -36,9 +36,9 @@
"""
import logging
-
from xml.dom.minidom import Document
from xml.etree.ElementTree import dump
+
from lxml import etree, objectify
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/custom/lib/db.py'
--- openlp/plugins/custom/lib/db.py 2017-11-13 21:40:49 +0000
+++ openlp/plugins/custom/lib/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/__init__.py'
--- openlp/plugins/images/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/images/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/endpoint.py'
--- openlp/plugins/images/endpoint.py 2017-09-26 17:21:54 +0000
+++ openlp/plugins/images/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,11 +21,10 @@
###############################################################################
import logging
+from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
+from openlp.core.api.http import requires_auth
from openlp.core.api.http.endpoint import Endpoint
from openlp.core.api.http.errors import NotFound
-from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
-from openlp.core.api.http import requires_auth
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/images/forms/__init__.py'
--- openlp/plugins/images/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/images/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/forms/addgroupdialog.py'
--- openlp/plugins/images/forms/addgroupdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/images/forms/addgroupdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/forms/addgroupform.py'
--- openlp/plugins/images/forms/addgroupform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/images/forms/addgroupform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/forms/choosegroupdialog.py'
--- openlp/plugins/images/forms/choosegroupdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/images/forms/choosegroupdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/forms/choosegroupform.py'
--- openlp/plugins/images/forms/choosegroupform.py 2017-06-04 12:14:23 +0000
+++ openlp/plugins/images/forms/choosegroupform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/images/imageplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,10 +20,10 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import logging
+
from PyQt5 import QtGui
-import logging
-
from openlp.core.api.http import register_endpoint
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
=== modified file 'openlp/plugins/images/lib/__init__.py'
--- openlp/plugins/images/lib/__init__.py 2017-03-03 19:27:31 +0000
+++ openlp/plugins/images/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,5 +20,5 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+from .imagetab import ImageTab
from .mediaitem import ImageMediaItem
-from .imagetab import ImageTab
=== modified file 'openlp/plugins/images/lib/db.py'
--- openlp/plugins/images/lib/db.py 2017-09-23 13:06:42 +0000
+++ openlp/plugins/images/lib/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/images/lib/imagetab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2017-11-21 07:23:02 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -37,7 +37,6 @@
from openlp.plugins.images.forms import AddGroupForm, ChooseGroupForm
from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/images/lib/upgrade.py'
--- openlp/plugins/images/lib/upgrade.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/images/lib/upgrade.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/media/__init__.py'
--- openlp/plugins/media/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/media/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/media/endpoint.py'
--- openlp/plugins/media/endpoint.py 2017-09-26 17:21:54 +0000
+++ openlp/plugins/media/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,11 +21,10 @@
###############################################################################
import logging
+from openlp.core.api.endpoint.pluginhelpers import search, live, 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
-from openlp.core.api.endpoint.pluginhelpers import search, live, service
-from openlp.core.api.http import requires_auth
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/media/forms/__init__.py'
--- openlp/plugins/media/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/media/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/media/forms/mediaclipselectordialog.py'
--- openlp/plugins/media/forms/mediaclipselectordialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/media/forms/mediaclipselectordialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/media/forms/mediaclipselectorform.py'
--- openlp/plugins/media/forms/mediaclipselectorform.py 2017-11-22 21:56:56 +0000
+++ openlp/plugins/media/forms/mediaclipselectorform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,21 +19,21 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import logging
import os
-import logging
import re
+from datetime import datetime
from time import sleep
-from datetime import datetime
from PyQt5 import QtCore, QtGui, QtWidgets
from openlp.core.common import is_win, is_linux, is_macosx
-from openlp.core.common.path import Path
from openlp.core.common.i18n import translate
from openlp.core.common.mixins import RegistryProperties
-from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
+from openlp.core.common.path import Path
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.media.vlcplayer import get_vlc
+from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
if is_win():
from win32com.client import Dispatch
=== modified file 'openlp/plugins/media/lib/__init__.py'
--- openlp/plugins/media/lib/__init__.py 2017-03-03 19:27:31 +0000
+++ openlp/plugins/media/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2017-12-17 04:29:53 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,8 +27,8 @@
from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import UiStrings, translate, get_natural_key
+from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import Path, path_to_str, create_paths
-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 ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \
=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/media/lib/mediatab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2017-11-19 21:57:38 +0000
+++ openlp/plugins/media/mediaplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,7 +23,6 @@
The Media plugin
"""
import logging
-import os
import re
from PyQt5 import QtCore
@@ -37,7 +36,6 @@
from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint
from openlp.plugins.media.lib import MediaMediaItem, MediaTab
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/presentations/__init__.py'
--- openlp/plugins/presentations/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/presentations/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/presentations/endpoint.py'
--- openlp/plugins/presentations/endpoint.py 2017-09-26 17:21:54 +0000
+++ openlp/plugins/presentations/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,11 +21,10 @@
###############################################################################
import logging
+from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
+from openlp.core.api.http import requires_auth
from openlp.core.api.http.endpoint import Endpoint
from openlp.core.api.http.errors import NotFound
-from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
-from openlp.core.api.http import requires_auth
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/presentations/lib/__init__.py'
--- openlp/plugins/presentations/lib/__init__.py 2017-03-03 19:27:31 +0000
+++ openlp/plugins/presentations/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py 2017-10-10 07:08:44 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2017-11-18 11:23:15 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,10 +24,10 @@
from PyQt5 import QtCore, QtGui, QtWidgets
from openlp.core.common.i18n import UiStrings, translate, get_natural_key
-from openlp.core.common.path import Path, path_to_str, str_to_path
+from openlp.core.common.path import path_to_str, str_to_path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext,\
+from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext, \
build_icon, check_item_selected, create_thumb, validate_thumb
from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
from openlp.plugins.presentations.lib import MessageListener
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py 2017-11-14 22:30:46 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,9 +24,9 @@
from PyQt5 import QtCore
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
from openlp.core.lib import ServiceItemContext
from openlp.core.ui import HideMode
from openlp.plugins.presentations.lib.pdfcontroller import PDF_CONTROLLER_FILETYPES
=== modified file 'openlp/plugins/presentations/lib/pdfcontroller.py'
--- openlp/plugins/presentations/lib/pdfcontroller.py 2017-11-15 21:58:19 +0000
+++ openlp/plugins/presentations/lib/pdfcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py 2017-10-10 07:08:44 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py 2017-11-03 20:55:41 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,8 +20,8 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
import logging
+import re
import zipfile
-import re
from xml.etree import ElementTree
from openlp.core.common import is_win
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/README.TXT'
--- openlp/plugins/presentations/lib/pptviewlib/README.TXT 2016-12-31 11:01:36 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/README.TXT 2017-12-29 10:10:27 +0000
@@ -1,6 +1,6 @@
PPTVIEWLIB - Control PowerPoint Viewer 2003/2007 (for openlp.org)
-Copyright (C) 2008-2017 Jonathan Corwin (j@xxxxxxxxxxxx)
+Copyright (C) 2008-2018 Jonathan Corwin (j@xxxxxxxxxxxx)
This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program,
allowing it to be more easily controlled from another program.
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py'
--- openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2017-01-25 21:17:27 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,10 +21,11 @@
###############################################################################
import sys
-from PyQt5 import QtWidgets
from ctypes import *
from ctypes.wintypes import RECT
+from PyQt5 import QtWidgets
+
class PPTViewer(QtWidgets.QWidget):
"""
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp'
--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2016-12-31 11:01:36 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2017-12-29 10:10:27 +0000
@@ -1,7 +1,7 @@
/******************************************************************************
* OpenLP - Open Source Lyrics Projection *
* --------------------------------------------------------------------------- *
-* Copyright (c) 2008-2017 OpenLP Developers *
+* Copyright (c) 2008-2018 OpenLP Developers *
* --------------------------------------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the Free *
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h'
--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2016-12-31 11:01:36 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2017-12-29 10:10:27 +0000
@@ -1,7 +1,7 @@
/******************************************************************************
* OpenLP - Open Source Lyrics Projection *
* --------------------------------------------------------------------------- *
-* Copyright (c) 2008-2017 OpenLP Developers *
+* Copyright (c) 2008-2018 OpenLP Developers *
* --------------------------------------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the Free *
=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py 2017-11-20 21:57:34 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2017-12-17 15:25:54 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,8 +23,8 @@
The :mod:`openlp.plugins.presentations.presentationplugin` module provides the ability for OpenLP to display
presentations from a variety of document formats.
"""
+import logging
import os
-import logging
from PyQt5 import QtCore
=== modified file 'openlp/plugins/songs/__init__.py'
--- openlp/plugins/songs/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/endpoint.py'
--- openlp/plugins/songs/endpoint.py 2017-09-26 21:04:39 +0000
+++ openlp/plugins/songs/endpoint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,11 +21,10 @@
###############################################################################
import logging
+from openlp.core.api.endpoint.pluginhelpers import search, live, 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
-from openlp.core.api.endpoint.pluginhelpers import search, live, service
-from openlp.core.api.http import requires_auth
-
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/forms/__init__.py'
--- openlp/plugins/songs/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
--- openlp/plugins/songs/forms/authorsdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/authorsdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/authorsform.py'
--- openlp/plugins/songs/forms/authorsform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/authorsform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/duplicatesongremovalform.py'
--- openlp/plugins/songs/forms/duplicatesongremovalform.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/forms/duplicatesongremovalform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -32,9 +32,9 @@
from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.registry import Registry
from openlp.core.widgets.wizard import OpenLPWizard, WizardStrings
+from openlp.plugins.songs.forms.songreviewwidget import SongReviewWidget
from openlp.plugins.songs.lib import delete_song
from openlp.plugins.songs.lib.db import Song
-from openlp.plugins.songs.forms.songreviewwidget import SongReviewWidget
from openlp.plugins.songs.lib.songcompare import songs_probably_equal
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,8 +30,8 @@
from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import UiStrings, translate, get_natural_key
+from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import create_paths, copyfile
-from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.registry import Registry
from openlp.core.lib import PluginStatus, MediaType, create_separated_list
from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, find_and_set_in_combo_box
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/forms/editversedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,8 +22,8 @@
from PyQt5 import QtWidgets
+from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.common.i18n import UiStrings, translate
from openlp.core.lib import build_icon
from openlp.core.lib.ui import create_button_box
from openlp.core.widgets.edits import SpellTextEdit
=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/forms/editverseform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,14 +20,14 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import logging
import re
-import logging
from PyQt5 import QtCore, QtGui, QtWidgets
-from openlp.core.lib.ui import critical_error_message_box
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
+from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.songs.forms.editversedialog import Ui_EditVerseDialog
from openlp.plugins.songs.lib import VerseType, transpose_lyrics
=== modified file 'openlp/plugins/songs/forms/mediafilesdialog.py'
--- openlp/plugins/songs/forms/mediafilesdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/mediafilesdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/mediafilesform.py'
--- openlp/plugins/songs/forms/mediafilesform.py 2017-09-30 20:16:30 +0000
+++ openlp/plugins/songs/forms/mediafilesform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -21,7 +21,6 @@
###############################################################################
import logging
-import os
from PyQt5 import QtCore, QtWidgets
=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
--- openlp/plugins/songs/forms/songbookdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/songbookdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/songbookform.py'
--- openlp/plugins/songs/forms/songbookform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/songbookform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/songexportform.py'
--- openlp/plugins/songs/forms/songexportform.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/forms/songexportform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
--- openlp/plugins/songs/forms/songmaintenancedialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/songmaintenancedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
--- openlp/plugins/songs/forms/songmaintenanceform.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/forms/songmaintenanceform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,8 +29,8 @@
from openlp.core.common.registry import Registry
from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.songs.forms.authorsform import AuthorsForm
+from openlp.plugins.songs.forms.songbookform import SongBookForm
from openlp.plugins.songs.forms.topicsform import TopicsForm
-from openlp.plugins.songs.forms.songbookform import SongBookForm
from openlp.plugins.songs.lib.db import Author, Book, Topic, Song
from .songmaintenancedialog import Ui_SongMaintenanceDialog
=== modified file 'openlp/plugins/songs/forms/songreviewwidget.py'
--- openlp/plugins/songs/forms/songreviewwidget.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/forms/songreviewwidget.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/songselectdialog.py'
--- openlp/plugins/songs/forms/songselectdialog.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/forms/songselectdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/songselectform.py'
--- openlp/plugins/songs/forms/songselectform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/songselectform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
--- openlp/plugins/songs/forms/topicsdialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/topicsdialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/forms/topicsform.py'
--- openlp/plugins/songs/forms/topicsform.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/forms/topicsform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,28 +27,28 @@
from openlp.core.common import is_win
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.widgets.wizard import WizardStrings
-from .importers.opensong import OpenSongImport
+from .importers.cclifile import CCLIFileImport
+from .importers.chordpro import ChordProImport
+from .importers.dreambeam import DreamBeamImport
from .importers.easyslides import EasySlidesImport
+from .importers.easyworship import EasyWorshipSongImport
+from .importers.foilpresenter import FoilPresenterImport
+from .importers.lyrix import LyrixImport
from .importers.openlp import OpenLPSongImport
from .importers.openlyrics import OpenLyricsImport
-from .importers.wordsofworship import WordsOfWorshipImport
-from .importers.cclifile import CCLIFileImport
-from .importers.dreambeam import DreamBeamImport
+from .importers.opensong import OpenSongImport
+from .importers.powerpraise import PowerPraiseImport
from .importers.powersong import PowerSongImport
-from .importers.easyworship import EasyWorshipSongImport
+from .importers.presentationmanager import PresentationManagerImport
+from .importers.propresenter import ProPresenterImport
from .importers.songbeamer import SongBeamerImport
+from .importers.songpro import SongProImport
from .importers.songshowplus import SongShowPlusImport
-from .importers.songpro import SongProImport
from .importers.sundayplus import SundayPlusImport
-from .importers.foilpresenter import FoilPresenterImport
+from .importers.videopsalm import VideoPsalmImport
+from .importers.wordsofworship import WordsOfWorshipImport
+from .importers.worshipassistant import WorshipAssistantImport
from .importers.zionworx import ZionWorxImport
-from .importers.propresenter import ProPresenterImport
-from .importers.worshipassistant import WorshipAssistantImport
-from .importers.powerpraise import PowerPraiseImport
-from .importers.presentationmanager import PresentationManagerImport
-from .importers.lyrix import LyrixImport
-from .importers.videopsalm import VideoPsalmImport
-from .importers.chordpro import ChordProImport
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/importers/__init__.py'
--- openlp/plugins/songs/lib/importers/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/lib/importers/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/cclifile.py'
--- openlp/plugins/songs/lib/importers/cclifile.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/cclifile.py 2017-12-29 10:10:27 +0000
@@ -1,10 +1,13 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+import codecs
+import logging
+
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -20,8 +23,6 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
import chardet
-import codecs
-import logging
from openlp.core.common.i18n import translate
from openlp.plugins.songs.lib import VerseType
=== modified file 'openlp/plugins/songs/lib/importers/dreambeam.py'
--- openlp/plugins/songs/lib/importers/dreambeam.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/dreambeam.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/easyslides.py'
--- openlp/plugins/songs/lib/importers/easyslides.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/importers/easyslides.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/easyworship.py'
--- openlp/plugins/songs/lib/importers/easyworship.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/easyworship.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,11 +25,10 @@
import logging
import os
import re
+import sqlite3
import struct
import zlib
-import sqlite3
-
from openlp.core.common.i18n import translate
from openlp.core.common.path import Path
from openlp.plugins.songs.lib import VerseType
=== modified file 'openlp/plugins/songs/lib/importers/foilpresenter.py'
--- openlp/plugins/songs/lib/importers/foilpresenter.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/foilpresenter.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -90,10 +90,10 @@
from openlp.core.common.i18n import translate
from openlp.core.widgets.wizard import WizardStrings
from openlp.plugins.songs.lib import clean_song, VerseType
+from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
from openlp.plugins.songs.lib.importers.songimport import SongImport
-from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
+from openlp.plugins.songs.lib.openlyricsxml import SongXML
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.openlyricsxml import SongXML
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/importers/lyrix.py'
--- openlp/plugins/songs/lib/importers/lyrix.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/lyrix.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/mediashout.py'
--- openlp/plugins/songs/lib/importers/mediashout.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/importers/mediashout.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,8 +27,9 @@
# WARNING: See https://docs.python.org/3/library/sqlite3.html for value substitution
# in SQL statements
+import logging
+
import pyodbc
-import logging
from openlp.core.common.i18n import translate
from openlp.plugins.songs.lib.importers.songimport import SongImport
=== modified file 'openlp/plugins/songs/lib/importers/openlp.py'
--- openlp/plugins/songs/lib/importers/openlp.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/openlp.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/openlyrics.py'
--- openlp/plugins/songs/lib/importers/openlyrics.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/openlyrics.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,8 +29,8 @@
from openlp.core.widgets.wizard import WizardStrings
from openlp.plugins.songs.lib.importers.songimport import SongImport
+from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, OpenLyricsError
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, OpenLyricsError
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/importers/openoffice.py'
--- openlp/plugins/songs/lib/importers/openoffice.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/importers/openoffice.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/opensong.py'
--- openlp/plugins/songs/lib/importers/opensong.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/importers/opensong.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/opspro.py'
--- openlp/plugins/songs/lib/importers/opspro.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/opspro.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,8 +29,9 @@
import logging
import re
+import struct
+
import pyodbc
-import struct
from openlp.core.common.i18n import translate
from openlp.plugins.songs.lib.importers.songimport import SongImport
=== modified file 'openlp/plugins/songs/lib/importers/powerpraise.py'
--- openlp/plugins/songs/lib/importers/powerpraise.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/powerpraise.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/powersong.py'
--- openlp/plugins/songs/lib/importers/powersong.py 2017-12-17 04:29:53 +0000
+++ openlp/plugins/songs/lib/importers/powersong.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/presentationmanager.py'
--- openlp/plugins/songs/lib/importers/presentationmanager.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/presentationmanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,8 +27,8 @@
from lxml import objectify, etree
+from openlp.core.common import get_file_encoding
from openlp.core.common.i18n import translate
-from openlp.core.common import get_file_encoding
from openlp.core.widgets.wizard import WizardStrings
from openlp.plugins.songs.lib.importers.songimport import SongImport
=== modified file 'openlp/plugins/songs/lib/importers/propresenter.py'
--- openlp/plugins/songs/lib/importers/propresenter.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/propresenter.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,6 +25,7 @@
"""
import base64
import logging
+
from lxml import objectify
from openlp.core.widgets.wizard import WizardStrings
=== modified file 'openlp/plugins/songs/lib/importers/songbeamer.py'
--- openlp/plugins/songs/lib/importers/songbeamer.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/songbeamer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,15 +22,15 @@
"""
The :mod:`songbeamer` module provides the functionality for importing SongBeamer songs into the OpenLP database.
"""
+import base64
import logging
+import math
import os
import re
-import base64
-import math
from openlp.core.common import is_win, is_macosx, get_file_encoding
+from openlp.core.common.path import Path
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
from openlp.plugins.songs.lib import VerseType
from openlp.plugins.songs.lib.importers.songimport import SongImport
=== modified file 'openlp/plugins/songs/lib/importers/songimport.py'
--- openlp/plugins/songs/lib/importers/songimport.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/importers/songimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -33,8 +33,8 @@
from openlp.core.widgets.wizard import WizardStrings
from openlp.plugins.songs.lib import clean_song, VerseType
from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile
+from openlp.plugins.songs.lib.openlyricsxml import SongXML
from openlp.plugins.songs.lib.ui import SongStrings
-from openlp.plugins.songs.lib.openlyricsxml import SongXML
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/importers/songpro.py'
--- openlp/plugins/songs/lib/importers/songpro.py 2017-09-30 20:16:30 +0000
+++ openlp/plugins/songs/lib/importers/songpro.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/songshowplus.py'
--- openlp/plugins/songs/lib/importers/songshowplus.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/importers/songshowplus.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/songsoffellowship.py'
--- openlp/plugins/songs/lib/importers/songsoffellowship.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/importers/songsoffellowship.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,13 +27,11 @@
# http://wiki.services.openoffice.org/wiki/Python
import logging
-import os
import re
from openlp.core.common import is_win
from .openoffice import OpenOfficeImport
-
log = logging.getLogger(__name__)
if is_win():
=== modified file 'openlp/plugins/songs/lib/importers/sundayplus.py'
--- openlp/plugins/songs/lib/importers/sundayplus.py 2017-12-22 22:35:09 +0000
+++ openlp/plugins/songs/lib/importers/sundayplus.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,7 +19,6 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-import os
import re
from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
=== modified file 'openlp/plugins/songs/lib/importers/videopsalm.py'
--- openlp/plugins/songs/lib/importers/videopsalm.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/videopsalm.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,10 +27,10 @@
import re
from openlp.core.common.i18n import translate
+from openlp.core.common.path import Path
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
+from openlp.plugins.songs.lib.db import AuthorType
from openlp.plugins.songs.lib.importers.songimport import SongImport
-from openlp.plugins.songs.lib.db import AuthorType
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/importers/wordsofworship.py'
--- openlp/plugins/songs/lib/importers/wordsofworship.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/wordsofworship.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,9 +23,8 @@
The :mod:`wordsofworship` module provides the functionality for importing Words of
Worship songs into the OpenLP database.
"""
+import logging
import os
-import logging
-from openlp.core.common.path import Path
from openlp.core.common.i18n import translate
from openlp.plugins.songs.lib.importers.songimport import SongImport
=== modified file 'openlp/plugins/songs/lib/importers/worshipassistant.py'
--- openlp/plugins/songs/lib/importers/worshipassistant.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/importers/worshipassistant.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/importers/worshipcenterpro.py'
--- openlp/plugins/songs/lib/importers/worshipcenterpro.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/lib/importers/worshipcenterpro.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,6 +25,7 @@
"""
import logging
import re
+
import pyodbc
from openlp.core.common.i18n import translate
=== modified file 'openlp/plugins/songs/lib/importers/zionworx.py'
--- openlp/plugins/songs/lib/importers/zionworx.py 2017-10-28 18:58:34 +0000
+++ openlp/plugins/songs/lib/importers/zionworx.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2017-10-10 02:29:56 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/openlyricsexport.py'
--- openlp/plugins/songs/lib/openlyricsexport.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/lib/openlyricsexport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,8 +29,8 @@
from openlp.core.common import clean_filename
from openlp.core.common.i18n import translate
+from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import create_paths
-from openlp.core.common.mixins import RegistryProperties
from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/openlyricsxml.py'
--- openlp/plugins/songs/lib/openlyricsxml.py 2017-10-28 10:04:09 +0000
+++ openlp/plugins/songs/lib/openlyricsxml.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -63,8 +63,8 @@
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
+from openlp.core.lib import FormattingTags
from openlp.core.version import get_version
-from openlp.core.lib import FormattingTags
from openlp.plugins.songs.lib import VerseType, clean_song
from openlp.plugins.songs.lib.db import Author, AuthorType, Book, Song, Topic
=== modified file 'openlp/plugins/songs/lib/songcompare.py'
--- openlp/plugins/songs/lib/songcompare.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/lib/songcompare.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/songselect.py'
--- openlp/plugins/songs/lib/songselect.py 2017-03-10 05:42:38 +0000
+++ openlp/plugins/songs/lib/songselect.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,11 +25,11 @@
import logging
import random
import re
+from html import unescape
+from html.parser import HTMLParser
from http.cookiejar import CookieJar
from urllib.parse import urlencode
from urllib.request import HTTPCookieProcessor, URLError, build_opener
-from html.parser import HTMLParser
-from html import unescape
from bs4 import BeautifulSoup, NavigableString
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/lib/songstab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/ui.py'
--- openlp/plugins/songs/lib/ui.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songs/lib/ui.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/lib/upgrade.py'
--- openlp/plugins/songs/lib/upgrade.py 2017-10-10 02:40:41 +0000
+++ openlp/plugins/songs/lib/upgrade.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/reporting.py'
--- openlp/plugins/songs/reporting.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songs/reporting.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2017-12-22 21:20:49 +0000
+++ openlp/plugins/songs/songsplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,7 +25,6 @@
"""
import logging
-import os
import sqlite3
from pathlib import Path
from tempfile import gettempdir
=== modified file 'openlp/plugins/songusage/__init__.py'
--- openlp/plugins/songusage/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songusage/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songusage/forms/__init__.py'
--- openlp/plugins/songusage/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songusage/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
--- openlp/plugins/songusage/forms/songusagedeletedialog.py 2017-10-07 07:05:07 +0000
+++ openlp/plugins/songusage/forms/songusagedeletedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py'
--- openlp/plugins/songusage/forms/songusagedeleteform.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songusage/forms/songusagedeleteform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,8 +24,8 @@
from openlp.core.common.i18n import translate
from openlp.core.common.mixins import RegistryProperties
+from openlp.plugins.songusage.forms.songusagedeletedialog import Ui_SongUsageDeleteDialog
from openlp.plugins.songusage.lib.db import SongUsageItem
-from openlp.plugins.songusage.forms.songusagedeletedialog import Ui_SongUsageDeleteDialog
class SongUsageDeleteForm(QtWidgets.QDialog, Ui_SongUsageDeleteDialog, RegistryProperties):
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py 2017-10-23 22:09:57 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py'
--- openlp/plugins/songusage/forms/songusagedetailform.py 2017-11-02 21:46:02 +0000
+++ openlp/plugins/songusage/forms/songusagedetailform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,8 +26,8 @@
from openlp.core.common.i18n import translate
from openlp.core.common.mixins import RegistryProperties
+from openlp.core.common.path import create_paths
from openlp.core.common.settings import Settings
-from openlp.core.common.path import create_paths
from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.songusage.lib.db import SongUsageItem
from .songusagedetaildialog import Ui_SongUsageDetailDialog
=== modified file 'openlp/plugins/songusage/lib/__init__.py'
--- openlp/plugins/songusage/lib/__init__.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songusage/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songusage/lib/db.py'
--- openlp/plugins/songusage/lib/db.py 2016-12-31 11:01:36 +0000
+++ openlp/plugins/songusage/lib/db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songusage/lib/upgrade.py'
--- openlp/plugins/songusage/lib/upgrade.py 2017-06-09 12:12:39 +0000
+++ openlp/plugins/songusage/lib/upgrade.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py 2017-11-02 21:46:02 +0000
+++ openlp/plugins/songusage/songusageplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/appveyor-webhook.py'
--- scripts/appveyor-webhook.py 2017-05-03 20:16:52 +0000
+++ scripts/appveyor-webhook.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py 2017-09-13 06:08:38 +0000
+++ scripts/check_dependencies.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/clean_up_resources.py'
--- scripts/clean_up_resources.py 2016-12-31 11:01:36 +0000
+++ scripts/clean_up_resources.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/generate_resources.sh'
--- scripts/generate_resources.sh 2016-12-31 11:01:36 +0000
+++ scripts/generate_resources.sh 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/jenkins_script.py'
--- scripts/jenkins_script.py 2017-12-23 19:15:28 +0000
+++ scripts/jenkins_script.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -158,11 +158,12 @@
"""
queue_info = self.server.get_queue_info()
tries = 0
- while queue_info and tries < 50:
+ loop_count = 100
+ while queue_info and tries < loop_count:
tries += 1
- time.sleep(0.5)
+ time.sleep(1)
queue_info = self.server.get_queue_info()
- if tries >= 50:
+ if tries >= loop_count:
raise Exception('Build has not started yet, it may be stuck in the queue.')
return self.server.get_build_info(job_name, build_number)
=== modified file 'scripts/lp-merge.py'
--- scripts/lp-merge.py 2017-03-23 05:12:37 +0000
+++ scripts/lp-merge.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/resources.patch'
--- scripts/resources.patch 2016-12-31 11:01:36 +0000
+++ scripts/resources.patch 2017-12-29 10:10:27 +0000
@@ -14,7 +14,7 @@
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
-+# Copyright (c) 2008-2017 OpenLP Developers #
++# Copyright (c) 2008-2018 OpenLP Developers #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/translation_utils.py'
--- scripts/translation_utils.py 2016-12-31 11:01:36 +0000
+++ scripts/translation_utils.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'scripts/websocket_client.py'
--- scripts/websocket_client.py 2017-03-04 19:17:59 +0000
+++ scripts/websocket_client.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'setup.py'
--- setup.py 2016-12-31 11:01:36 +0000
+++ setup.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/__init__.py'
--- tests/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/__init__.py'
--- tests/functional/__init__.py 2017-05-08 18:33:11 +0000
+++ tests/functional/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,7 +22,6 @@
"""
Base directory for tests
"""
-import sys
from PyQt5 import QtWidgets
# Only one QApplication can be created. Use QtWidgets.QApplication.instance() when you need to "create" a QApplication.
=== modified file 'tests/functional/openlp_core/__init__.py'
--- tests/functional/openlp_core/__init__.py 2016-03-31 16:14:28 +0000
+++ tests/functional/openlp_core/__init__.py 2017-12-29 10:10:27 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2018 OpenLP Developers #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
=== modified file 'tests/functional/openlp_core/api/__init__.py'
--- tests/functional/openlp_core/api/__init__.py 2017-10-10 07:08:44 +0000
+++ tests/functional/openlp_core/api/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/api/http/__init__.py'
--- tests/functional/openlp_core/api/http/__init__.py 2017-03-04 19:17:59 +0000
+++ tests/functional/openlp_core/api/http/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/api/http/test_error.py'
--- tests/functional/openlp_core/api/http/test_error.py 2017-12-09 15:00:39 +0000
+++ tests/functional/openlp_core/api/http/test_error.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/api/http/test_http.py'
--- tests/functional/openlp_core/api/http/test_http.py 2017-12-09 15:21:59 +0000
+++ tests/functional/openlp_core/api/http/test_http.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,8 +25,8 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from openlp.core.api.http.server import HttpServer
from openlp.core.common.registry import Registry
-from openlp.core.api.http.server import HttpServer
class TestHttpServer(TestCase):
=== modified file 'tests/functional/openlp_core/api/http/test_wsgiapp.py'
--- tests/functional/openlp_core/api/http/test_wsgiapp.py 2017-12-09 15:21:59 +0000
+++ tests/functional/openlp_core/api/http/test_wsgiapp.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,12 +23,11 @@
Functional test the routing code.
"""
import os
-
from unittest import TestCase
from unittest.mock import MagicMock
+from openlp.core.api.http import register_endpoint, application, NotFound
from openlp.core.api.http.endpoint import Endpoint
-from openlp.core.api.http import register_endpoint, application, NotFound
ROOT_DIR = os.path.dirname(os.path.realpath(__file__))
=== modified file 'tests/functional/openlp_core/api/test_deploy.py'
--- tests/functional/openlp_core/api/test_deploy.py 2017-12-09 15:21:59 +0000
+++ tests/functional/openlp_core/api/test_deploy.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/api/test_tab.py'
--- tests/functional/openlp_core/api/test_tab.py 2017-12-22 21:20:49 +0000
+++ tests/functional/openlp_core/api/test_tab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,9 +28,9 @@
from PyQt5 import QtWidgets
+from openlp.core.api.tab import ApiTab
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.api.tab import ApiTab
from tests.helpers.testmixin import TestMixin
__default_settings__ = {
=== modified file 'tests/functional/openlp_core/api/test_websockets.py'
--- tests/functional/openlp_core/api/test_websockets.py 2017-12-09 15:34:16 +0000
+++ tests/functional/openlp_core/api/test_websockets.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,10 +25,10 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from openlp.core.api.poll import Poller
+from openlp.core.api.websockets import WebSocketServer
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.api.websockets import WebSocketServer
-from openlp.core.api.poll import Poller
from tests.helpers.testmixin import TestMixin
__default_settings__ = {
=== modified file 'tests/functional/openlp_core/common/__init__.py'
--- tests/functional/openlp_core/common/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_core/common/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_actions.py'
--- tests/functional/openlp_core/common/test_actions.py 2017-12-23 09:22:53 +0000
+++ tests/functional/openlp_core/common/test_actions.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.actions import CategoryActionList, ActionList
from openlp.core.common.settings import Settings
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/common/test_applocation.py'
--- tests/functional/openlp_core/common/test_applocation.py 2017-10-07 07:05:07 +0000
+++ tests/functional/openlp_core/common/test_applocation.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_common.py'
--- tests/functional/openlp_core/common/test_common.py 2017-12-16 08:43:33 +0000
+++ tests/functional/openlp_core/common/test_common.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_db.py'
--- tests/functional/openlp_core/common/test_db.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_core/common/test_db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_httputils.py'
--- tests/functional/openlp_core/common/test_httputils.py 2017-12-16 08:43:33 +0000
+++ tests/functional/openlp_core/common/test_httputils.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.httputils import get_user_agent, get_web_page, get_url_file_size, url_get_file
from openlp.core.common.path import Path
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/common/test_i18n.py'
--- tests/functional/openlp_core/common/test_i18n.py 2017-12-01 00:31:48 +0000
+++ tests/functional/openlp_core/common/test_i18n.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_init.py'
--- tests/functional/openlp_core/common/test_init.py 2017-12-23 09:22:53 +0000
+++ tests/functional/openlp_core/common/test_init.py 2017-12-29 10:10:27 +0000
@@ -22,15 +22,13 @@
"""
Functional tests to test the AppLocation class and related methods.
"""
-import os
from io import BytesIO
from unittest import TestCase
from unittest.mock import MagicMock, PropertyMock, call, patch
-from openlp.core.common import add_actions, clean_filename, delete_file, get_file_encoding, get_filesystem_encoding, \
+from openlp.core.common import add_actions, clean_filename, delete_file, get_file_encoding, get_filesystem_encoding, \
get_uno_command, get_uno_instance
from openlp.core.common.path import Path
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/common/test_json.py'
--- tests/functional/openlp_core/common/test_json.py 2017-12-15 16:19:42 +0000
+++ tests/functional/openlp_core/common/test_json.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,8 +26,8 @@
from unittest import TestCase
from unittest.mock import patch
+from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder
from openlp.core.common.path import Path
-from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder
class TestOpenLPJsonDecoder(TestCase):
=== modified file 'tests/functional/openlp_core/common/test_mixins.py'
--- tests/functional/openlp_core/common/test_mixins.py 2017-12-15 16:19:42 +0000
+++ tests/functional/openlp_core/common/test_mixins.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_path.py'
--- tests/functional/openlp_core/common/test_path.py 2017-12-15 16:19:42 +0000
+++ tests/functional/openlp_core/common/test_path.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_projector_utilities.py'
--- tests/functional/openlp_core/common/test_projector_utilities.py 2017-12-16 08:43:33 +0000
+++ tests/functional/openlp_core/common/test_projector_utilities.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,7 +26,6 @@
from unittest import TestCase
from openlp.core.common import verify_ip_address, md5_hash, qmd5_hash
-
from tests.resources.projector.data import TEST_PIN, TEST_SALT, TEST_HASH
salt = TEST_SALT
=== modified file 'tests/functional/openlp_core/common/test_registry.py'
--- tests/functional/openlp_core/common/test_registry.py 2017-12-22 21:20:49 +0000
+++ tests/functional/openlp_core/common/test_registry.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/common/test_settings.py'
--- tests/functional/openlp_core/common/test_settings.py 2017-12-09 16:29:58 +0000
+++ tests/functional/openlp_core/common/test_settings.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,7 +28,6 @@
from openlp.core.common import settings
from openlp.core.common.settings import Settings, media_players_conv
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/display/__init__.py'
--- tests/functional/openlp_core/display/__init__.py 2017-10-10 07:08:44 +0000
+++ tests/functional/openlp_core/display/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/display/test_renderer.py'
--- tests/functional/openlp_core/display/test_renderer.py 2017-12-17 14:12:27 +0000
+++ tests/functional/openlp_core/display/test_renderer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,12 +28,11 @@
from PyQt5 import QtCore
from openlp.core.common.registry import Registry
+from openlp.core.display.renderer import Renderer, words_split, get_start_tags
from openlp.core.display.screens import ScreenList
-from openlp.core.display.renderer import Renderer, words_split, get_start_tags
from openlp.core.lib import ServiceItem
from openlp.core.lib.theme import Theme
-
SCREEN = {
'primary': False,
'number': 1,
=== modified file 'tests/functional/openlp_core/display/test_screens.py'
--- tests/functional/openlp_core/display/test_screens.py 2017-12-17 14:12:27 +0000
+++ tests/functional/openlp_core/display/test_screens.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/lib/test_db.py'
--- tests/functional/openlp_core/lib/test_db.py 2017-12-17 14:12:27 +0000
+++ tests/functional/openlp_core/lib/test_db.py 2017-12-29 10:10:27 +0000
@@ -23,14 +23,13 @@
Package to test the openlp.core.lib package.
"""
import shutil
-
from tempfile import mkdtemp
from unittest import TestCase
from unittest.mock import patch, MagicMock
+from sqlalchemy import MetaData
+from sqlalchemy.orm.scoping import ScopedSession
from sqlalchemy.pool import NullPool
-from sqlalchemy.orm.scoping import ScopedSession
-from sqlalchemy import MetaData
from openlp.core.common.path import Path
from openlp.core.lib.db import init_db, get_upgrade_op, delete_database, upgrade_db
=== modified file 'tests/functional/openlp_core/lib/test_htmlbuilder.py'
--- tests/functional/openlp_core/lib/test_htmlbuilder.py 2017-12-17 15:35:35 +0000
+++ tests/functional/openlp_core/lib/test_htmlbuilder.py 2017-12-29 10:10:27 +0000
@@ -10,7 +10,6 @@
from openlp.core.lib.htmlbuilder import build_html, build_background_css, build_lyrics_css, build_lyrics_outline_css, \
build_lyrics_format_css, build_footer_css, webkit_version, build_chords_css
from openlp.core.lib.theme import HorizontalType, VerticalType
-
from tests.helpers.testmixin import TestMixin
HTML = """
=== modified file 'tests/functional/openlp_core/lib/test_image_manager.py'
--- tests/functional/openlp_core/lib/test_image_manager.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_core/lib/test_image_manager.py 2017-12-29 10:10:27 +0000
@@ -33,7 +33,6 @@
from openlp.core.common.registry import Registry
from openlp.core.display.screens import ScreenList
from openlp.core.lib.imagemanager import ImageManager, Priority
-
from tests.helpers.testmixin import TestMixin
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_core/lib/test_mediamanageritem.py'
--- tests/functional/openlp_core/lib/test_mediamanageritem.py 2017-12-17 17:52:17 +0000
+++ tests/functional/openlp_core/lib/test_mediamanageritem.py 2017-12-29 10:10:27 +0000
@@ -26,7 +26,6 @@
from unittest.mock import MagicMock, patch
from openlp.core.lib import MediaManagerItem
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/lib/test_pluginmanager.py'
--- tests/functional/openlp_core/lib/test_pluginmanager.py 2017-12-17 17:52:17 +0000
+++ tests/functional/openlp_core/lib/test_pluginmanager.py 2017-12-29 10:10:27 +0000
@@ -27,8 +27,8 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
+from openlp.core.lib import PluginStatus
from openlp.core.lib.pluginmanager import PluginManager
-from openlp.core.lib import PluginStatus
class TestPluginManager(TestCase):
=== modified file 'tests/functional/openlp_core/lib/test_serviceitem.py'
--- tests/functional/openlp_core/lib/test_serviceitem.py 2017-12-22 22:21:38 +0000
+++ tests/functional/openlp_core/lib/test_serviceitem.py 2017-12-29 10:10:27 +0000
@@ -30,7 +30,6 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.lib import ItemCapabilities, ServiceItem, ServiceItemType, FormattingTags
-
from tests.helpers.testmixin import TestMixin
from tests.utils import assert_length, convert_file_service_item
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_core/lib/test_theme.py'
--- tests/functional/openlp_core/lib/test_theme.py 2017-12-17 17:52:17 +0000
+++ tests/functional/openlp_core/lib/test_theme.py 2017-12-29 10:10:27 +0000
@@ -22,7 +22,6 @@
"""
Package to test the openlp.core.lib.theme package.
"""
-import os
from pathlib import Path
from unittest import TestCase
=== modified file 'tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py'
--- tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py 2017-12-04 00:24:47 +0000
+++ tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py 2017-12-29 10:10:27 +0000
@@ -26,7 +26,6 @@
from openlp.core.projectors.db import Projector
from openlp.core.projectors.pjlink import PJLink
-
from tests.resources.projector.data import TEST1_DATA
=== modified file 'tests/functional/openlp_core/projectors/test_projector_db.py'
--- tests/functional/openlp_core/projectors/test_projector_db.py 2017-12-23 09:22:53 +0000
+++ tests/functional/openlp_core/projectors/test_projector_db.py 2017-12-29 10:10:27 +0000
@@ -28,7 +28,6 @@
import os
import shutil
from tempfile import mkdtemp
-
from unittest import TestCase
from unittest.mock import patch
@@ -36,7 +35,6 @@
from openlp.core.projectors import upgrade
from openlp.core.projectors.constants import PJLINK_PORT
from openlp.core.projectors.db import Manufacturer, Model, Projector, ProjectorDB, ProjectorSource, Source
-
from tests.resources.projector.data import TEST_DB_PJLINK1, TEST_DB, TEST1_DATA, TEST2_DATA, TEST3_DATA
from tests.utils.constants import TEST_RESOURCES_PATH
=== modified file 'tests/functional/openlp_core/projectors/test_projector_pjlink_base.py'
--- tests/functional/openlp_core/projectors/test_projector_pjlink_base.py 2017-12-04 00:24:47 +0000
+++ tests/functional/openlp_core/projectors/test_projector_pjlink_base.py 2017-12-29 10:10:27 +0000
@@ -28,7 +28,6 @@
from openlp.core.projectors.constants import E_PARAMETER, ERROR_STRING, S_ON, S_CONNECTED, S_QSOCKET_STATE
from openlp.core.projectors.db import Projector
from openlp.core.projectors.pjlink import PJLink
-
from tests.resources.projector.data import TEST1_DATA
pjlink_test = PJLink(Projector(**TEST1_DATA), no_poll=True)
=== modified file 'tests/functional/openlp_core/projectors/test_projector_pjlink_commands_01.py'
--- tests/functional/openlp_core/projectors/test_projector_pjlink_commands_01.py 2017-12-09 11:17:05 +0000
+++ tests/functional/openlp_core/projectors/test_projector_pjlink_commands_01.py 2017-12-29 10:10:27 +0000
@@ -32,7 +32,6 @@
S_CONNECTED, S_OFF, S_ON, S_NOT_CONNECTED, S_CONNECTING, S_STANDBY
from openlp.core.projectors.db import Projector
from openlp.core.projectors.pjlink import PJLink
-
from tests.resources.projector.data import TEST_PIN, TEST1_DATA
pjlink_test = PJLink(Projector(**TEST1_DATA), pin=TEST_PIN, no_poll=True)
=== modified file 'tests/functional/openlp_core/projectors/test_projector_pjlink_commands_02.py'
--- tests/functional/openlp_core/projectors/test_projector_pjlink_commands_02.py 2017-12-05 00:54:15 +0000
+++ tests/functional/openlp_core/projectors/test_projector_pjlink_commands_02.py 2017-12-29 10:10:27 +0000
@@ -29,7 +29,6 @@
from openlp.core.projectors.constants import S_CONNECTED
from openlp.core.projectors.db import Projector
from openlp.core.projectors.pjlink import PJLink
-
from tests.resources.projector.data import TEST_HASH, TEST_PIN, TEST_SALT, TEST1_DATA
=== modified file 'tests/functional/openlp_core/test_app.py'
--- tests/functional/openlp_core/test_app.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_core/test_app.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,7 +19,6 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-import os
import sys
from unittest import TestCase, skip
from unittest.mock import MagicMock, patch
@@ -28,7 +27,6 @@
from openlp.core.app import OpenLP, parse_options
from openlp.core.common.settings import Settings
-
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_core/test_version.py'
--- tests/functional/openlp_core/test_version.py 2017-09-13 06:08:38 +0000
+++ tests/functional/openlp_core/test_version.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/ui/media/__init__.py'
--- tests/functional/openlp_core/ui/media/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_core/ui/media/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/ui/media/test_mediacontroller.py'
--- tests/functional/openlp_core/ui/media/test_mediacontroller.py 2017-12-20 08:15:53 +0000
+++ tests/functional/openlp_core/ui/media/test_mediacontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,10 +25,9 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from openlp.core.common.registry import Registry
from openlp.core.ui.media.mediacontroller import MediaController
from openlp.core.ui.media.mediaplayer import MediaPlayer
-from openlp.core.common.registry import Registry
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/ui/media/test_systemplayer.py'
--- tests/functional/openlp_core/ui/media/test_systemplayer.py 2017-12-22 10:45:39 +0000
+++ tests/functional/openlp_core/ui/media/test_systemplayer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/ui/media/test_vlcplayer.py'
--- tests/functional/openlp_core/ui/media/test_vlcplayer.py 2017-12-22 10:45:39 +0000
+++ tests/functional/openlp_core/ui/media/test_vlcplayer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -31,7 +31,6 @@
from openlp.core.common.registry import Registry
from openlp.core.ui.media import MediaState, MediaType
from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
-
from tests.helpers import MockDateTime
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/ui/media/test_webkitplayer.py'
--- tests/functional/openlp_core/ui/media/test_webkitplayer.py 2017-12-20 17:24:56 +0000
+++ tests/functional/openlp_core/ui/media/test_webkitplayer.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/ui/test_aboutform.py'
--- tests/functional/openlp_core/ui/test_aboutform.py 2017-12-20 17:37:58 +0000
+++ tests/functional/openlp_core/ui/test_aboutform.py 2017-12-29 10:10:27 +0000
@@ -27,7 +27,6 @@
from unittest.mock import patch
from openlp.core.ui.aboutform import AboutForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/ui/test_advancedtab.py'
--- tests/functional/openlp_core/ui/test_advancedtab.py 2017-12-20 17:37:58 +0000
+++ tests/functional/openlp_core/ui/test_advancedtab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.core.common.registry import Registry
from openlp.core.ui.advancedtab import AdvancedTab
from openlp.core.ui.settingsform import SettingsForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/ui/test_exceptionform.py'
--- tests/functional/openlp_core/ui/test_exceptionform.py 2017-10-07 07:05:07 +0000
+++ tests/functional/openlp_core/ui/test_exceptionform.py 2017-12-29 10:10:27 +0000
@@ -24,14 +24,12 @@
"""
import os
import tempfile
-
from unittest import TestCase
from unittest.mock import call, patch
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
-from openlp.core.common.path import Path
from openlp.core.ui import exceptionform
-
from tests.helpers.testmixin import TestMixin
exceptionform.WEBKIT_VERSION = 'Webkit Test'
=== modified file 'tests/functional/openlp_core/ui/test_first_time.py'
--- tests/functional/openlp_core/ui/test_first_time.py 2017-11-03 20:55:41 +0000
+++ tests/functional/openlp_core/ui/test_first_time.py 2017-12-29 10:10:27 +0000
@@ -26,7 +26,6 @@
from unittest.mock import patch
from openlp.core.common.httputils import CONNECTION_RETRIES, get_web_page
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/ui/test_firsttimeform.py'
--- tests/functional/openlp_core/ui/test_firsttimeform.py 2017-12-20 17:37:58 +0000
+++ tests/functional/openlp_core/ui/test_firsttimeform.py 2017-12-29 10:10:27 +0000
@@ -24,14 +24,12 @@
"""
import os
import tempfile
-import urllib
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
-from openlp.core.common.path import Path
from openlp.core.ui.firsttimeform import FirstTimeForm
-
from tests.helpers.testmixin import TestMixin
FAKE_CONFIG = """
=== modified file 'tests/functional/openlp_core/ui/test_maindisplay.py'
--- tests/functional/openlp_core/ui/test_maindisplay.py 2017-12-20 20:38:43 +0000
+++ tests/functional/openlp_core/ui/test_maindisplay.py 2017-12-29 10:10:27 +0000
@@ -34,7 +34,6 @@
from openlp.core.lib import PluginManager
from openlp.core.ui import MainDisplay, AudioPlayer
from openlp.core.ui.maindisplay import TRANSPARENT_STYLESHEET, OPAQUE_STYLESHEET
-
from tests.helpers.testmixin import TestMixin
if is_macosx():
=== modified file 'tests/functional/openlp_core/ui/test_mainwindow.py'
--- tests/functional/openlp_core/ui/test_mainwindow.py 2017-12-23 09:09:45 +0000
+++ tests/functional/openlp_core/ui/test_mainwindow.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -32,7 +32,6 @@
from openlp.core.common.registry import Registry
from openlp.core.display.screens import ScreenList
from openlp.core.ui.mainwindow import MainWindow
-
from tests.helpers.testmixin import TestMixin
from tests.utils.constants import TEST_RESOURCES_PATH
=== modified file 'tests/functional/openlp_core/ui/test_media.py'
--- tests/functional/openlp_core/ui/test_media.py 2017-12-20 20:38:43 +0000
+++ tests/functional/openlp_core/ui/test_media.py 2017-12-29 10:10:27 +0000
@@ -28,7 +28,6 @@
from PyQt5 import QtCore
from openlp.core.ui.media import get_media_players, parse_optical_path
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/ui/test_style.py'
--- tests/functional/openlp_core/ui/test_style.py 2017-10-10 02:40:41 +0000
+++ tests/functional/openlp_core/ui/test_style.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/ui/test_thememanager.py'
--- tests/functional/openlp_core/ui/test_thememanager.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_core/ui/test_thememanager.py 2017-12-29 10:10:27 +0000
@@ -30,11 +30,15 @@
from PyQt5 import QtWidgets
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
-from openlp.core.common.path import Path
from openlp.core.ui import ThemeManager
+<<<<<<< TREE
from tests.utils.constants import RESOURCE_PATH
+=======
+from tests.utils.constants import TEST_RESOURCES_PATH
+>>>>>>> MERGE-SOURCE
class TestThemeManager(TestCase):
=== modified file 'tests/functional/openlp_core/ui/test_themetab.py'
--- tests/functional/openlp_core/ui/test_themetab.py 2017-12-20 21:18:44 +0000
+++ tests/functional/openlp_core/ui/test_themetab.py 2017-12-29 10:10:27 +0000
@@ -26,9 +26,8 @@
from unittest.mock import MagicMock
from openlp.core.common.registry import Registry
+from openlp.core.ui.settingsform import SettingsForm
from openlp.core.ui.themestab import ThemesTab
-from openlp.core.ui.settingsform import SettingsForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/widgets/__init__.py'
--- tests/functional/openlp_core/widgets/__init__.py 2017-10-23 22:09:57 +0000
+++ tests/functional/openlp_core/widgets/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/widgets/test_buttons.py'
--- tests/functional/openlp_core/widgets/test_buttons.py 2017-12-19 19:22:47 +0000
+++ tests/functional/openlp_core/widgets/test_buttons.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_core/widgets/test_edits.py'
--- tests/functional/openlp_core/widgets/test_edits.py 2017-12-20 08:15:53 +0000
+++ tests/functional/openlp_core/widgets/test_edits.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,9 +27,9 @@
from unittest.mock import MagicMock, PropertyMock, patch
from openlp.core.common.path import Path
-from openlp.core.widgets.enums import PathEditType
from openlp.core.widgets.dialogs import FileDialog
from openlp.core.widgets.edits import PathEdit
+from openlp.core.widgets.enums import PathEditType
class TestPathEdit(TestCase):
=== modified file 'tests/functional/openlp_core/widgets/test_views.py'
--- tests/functional/openlp_core/widgets/test_views.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_core/widgets/test_views.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/__init__.py'
--- tests/functional/openlp_plugins/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/alerts/__init__.py'
--- tests/functional/openlp_plugins/alerts/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/alerts/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/alerts/test_manager.py'
--- tests/functional/openlp_plugins/alerts/test_manager.py 2017-12-23 09:09:45 +0000
+++ tests/functional/openlp_plugins/alerts/test_manager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,10 +22,8 @@
"""
This module contains tests for the CSV Bible importer.
"""
-import os
-import json
from unittest import TestCase
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
from openlp.core.common.registry import Registry
from openlp.plugins.alerts.lib.alertsmanager import AlertsManager
=== modified file 'tests/functional/openlp_plugins/bibles/__init__.py'
--- tests/functional/openlp_plugins/bibles/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/bibles/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/bibles/test_bibleimport.py'
--- tests/functional/openlp_plugins/bibles/test_bibleimport.py 2017-11-11 16:36:50 +0000
+++ tests/functional/openlp_plugins/bibles/test_bibleimport.py 2017-12-29 10:10:27 +0000
@@ -26,8 +26,8 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from PyQt5.QtWidgets import QDialog
from lxml import etree, objectify
-from PyQt5.QtWidgets import QDialog
from openlp.core.common.i18n import Language
from openlp.core.common.path import Path
=== modified file 'tests/functional/openlp_plugins/bibles/test_bibleserver.py'
--- tests/functional/openlp_plugins/bibles/test_bibleserver.py 2017-12-22 16:53:40 +0000
+++ tests/functional/openlp_plugins/bibles/test_bibleserver.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/bibles/test_csvimport.py'
--- tests/functional/openlp_plugins/bibles/test_csvimport.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/bibles/test_csvimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -31,7 +31,6 @@
from openlp.core.lib.exceptions import ValidationError
from openlp.plugins.bibles.lib.bibleimport import BibleImport
from openlp.plugins.bibles.lib.importers.csvbible import Book, CSVBible, Verse
-
from tests.utils import load_external_result_data
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/bibles/test_db.py'
--- tests/functional/openlp_plugins/bibles/test_db.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/bibles/test_db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/bibles/test_lib.py'
--- tests/functional/openlp_plugins/bibles/test_lib.py 2017-12-24 07:11:30 +0000
+++ tests/functional/openlp_plugins/bibles/test_lib.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.plugins.bibles import lib
from openlp.plugins.bibles.lib import SearchResults, get_reference_match
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/bibles/test_manager.py'
--- tests/functional/openlp_plugins/bibles/test_manager.py 2017-12-22 16:53:40 +0000
+++ tests/functional/openlp_plugins/bibles/test_manager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/bibles/test_mediaitem.py'
--- tests/functional/openlp_plugins/bibles/test_mediaitem.py 2017-12-24 07:11:30 +0000
+++ tests/functional/openlp_plugins/bibles/test_mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,12 +27,11 @@
from PyQt5 import QtCore, QtWidgets
-from tests.helpers.testmixin import TestMixin
-
from openlp.core.common.registry import Registry
from openlp.core.lib import MediaManagerItem
from openlp.plugins.bibles.lib.mediaitem import BibleMediaItem, BibleSearch, ResultsTab, SearchStatus, SearchTabs, \
get_reference_separators, VALID_TEXT_SEARCH
+from tests.helpers.testmixin import TestMixin
class TestBibleMediaItemModulefunctions(TestCase):
=== modified file 'tests/functional/openlp_plugins/bibles/test_opensongimport.py'
--- tests/functional/openlp_plugins/bibles/test_opensongimport.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/bibles/test_opensongimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,9 +28,8 @@
from lxml import objectify
from openlp.core.common.registry import Registry
+from openlp.plugins.bibles.lib.bibleimport import BibleImport
from openlp.plugins.bibles.lib.importers.opensong import OpenSongBible, get_text, parse_chapter_number
-from openlp.plugins.bibles.lib.bibleimport import BibleImport
-
from tests.helpers.testmixin import TestMixin
from tests.utils import load_external_result_data
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/bibles/test_osisimport.py'
--- tests/functional/openlp_plugins/bibles/test_osisimport.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/bibles/test_osisimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,7 +28,6 @@
from openlp.plugins.bibles.lib.bibleimport import BibleImport
from openlp.plugins.bibles.lib.db import BibleDB
from openlp.plugins.bibles.lib.importers.osis import OSISBible
-
from tests.utils import load_external_result_data
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/bibles/test_swordimport.py'
--- tests/functional/openlp_plugins/bibles/test_swordimport.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/bibles/test_swordimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/bibles/test_versereferencelist.py'
--- tests/functional/openlp_plugins/bibles/test_versereferencelist.py 2017-12-22 16:53:40 +0000
+++ tests/functional/openlp_plugins/bibles/test_versereferencelist.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/bibles/test_wordprojectimport.py'
--- tests/functional/openlp_plugins/bibles/test_wordprojectimport.py 2017-12-24 07:15:50 +0000
+++ tests/functional/openlp_plugins/bibles/test_wordprojectimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.core.common.path import Path
from openlp.plugins.bibles.lib.importers.wordproject import WordProjectBible
-
from tests.utils.constants import RESOURCE_PATH
TEST_PATH = RESOURCE_PATH / 'bibles'
=== modified file 'tests/functional/openlp_plugins/bibles/test_zefaniaimport.py'
--- tests/functional/openlp_plugins/bibles/test_zefaniaimport.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/bibles/test_zefaniaimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.plugins.bibles.lib.db import BibleDB
from openlp.plugins.bibles.lib.importers.zefania import ZefaniaBible
-
from tests.utils import load_external_result_data
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/custom/__init__.py'
--- tests/functional/openlp_plugins/custom/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/custom/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/custom/test_mediaitem.py'
--- tests/functional/openlp_plugins/custom/test_mediaitem.py 2017-12-22 17:15:30 +0000
+++ tests/functional/openlp_plugins/custom/test_mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,7 +30,6 @@
from openlp.core.common.registry import Registry
from openlp.core.lib import ServiceItem, PluginStatus
from openlp.plugins.custom.lib import CustomMediaItem
-
from tests.helpers.testmixin import TestMixin
FOOTER = ['Arky Arky (Unknown)', 'Public Domain', 'CCLI 123456']
=== modified file 'tests/functional/openlp_plugins/images/__init__.py'
--- tests/functional/openlp_plugins/images/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/images/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/images/test_imagetab.py'
--- tests/functional/openlp_plugins/images/test_imagetab.py 2017-12-22 17:15:30 +0000
+++ tests/functional/openlp_plugins/images/test_imagetab.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,7 +30,6 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.plugins.images.lib import ImageTab
-
from tests.helpers.testmixin import TestMixin
__default_settings__ = {
=== modified file 'tests/functional/openlp_plugins/images/test_lib.py'
--- tests/functional/openlp_plugins/images/test_lib.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/images/test_lib.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,8 +27,8 @@
from PyQt5 import QtCore, QtWidgets
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
-from openlp.core.common.path import Path
from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
from openlp.plugins.images.lib.mediaitem import ImageMediaItem
=== modified file 'tests/functional/openlp_plugins/images/test_upgrade.py'
--- tests/functional/openlp_plugins/images/test_upgrade.py 2017-12-22 17:15:30 +0000
+++ tests/functional/openlp_plugins/images/test_upgrade.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -34,7 +34,6 @@
from openlp.core.lib.db import Manager
from openlp.plugins.images.lib import upgrade
from openlp.plugins.images.lib.db import ImageFilenames, init_schema
-
from tests.helpers.testmixin import TestMixin
from tests.utils.constants import TEST_RESOURCES_PATH
=== modified file 'tests/functional/openlp_plugins/media/test_mediaitem.py'
--- tests/functional/openlp_plugins/media/test_mediaitem.py 2017-12-22 21:04:29 +0000
+++ tests/functional/openlp_plugins/media/test_mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,10 +27,9 @@
from PyQt5 import QtCore
+from openlp.core.common.path import Path
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
from openlp.plugins.media.lib.mediaitem import MediaMediaItem
-
from tests.helpers.testmixin import TestMixin
__default_settings__ = {
=== modified file 'tests/functional/openlp_plugins/media/test_mediaplugin.py'
--- tests/functional/openlp_plugins/media/test_mediaplugin.py 2017-12-23 09:22:53 +0000
+++ tests/functional/openlp_plugins/media/test_mediaplugin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.media.mediaplugin import MediaPlugin, process_check_binary
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/presentations/__init__.py'
--- tests/functional/openlp_plugins/presentations/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/presentations/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/presentations/test_impresscontroller.py'
--- tests/functional/openlp_plugins/presentations/test_impresscontroller.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/presentations/test_impresscontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,18 +22,23 @@
"""
Functional tests to test the Impress class and related methods.
"""
+import shutil
+from tempfile import mkdtemp
from unittest import TestCase
from unittest.mock import MagicMock, patch
-import shutil
-from tempfile import mkdtemp
+from openlp.core.common.path import Path
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
from openlp.plugins.presentations.lib.impresscontroller import ImpressController, ImpressDocument, TextType
from openlp.plugins.presentations.presentationplugin import __default_settings__
+<<<<<<< TREE
from tests.utils.constants import RESOURCE_PATH
from tests.helpers.testmixin import TestMixin
+=======
+from tests.helpers.testmixin import TestMixin
+from tests.utils.constants import TEST_RESOURCES_PATH
+>>>>>>> MERGE-SOURCE
class TestImpressController(TestCase, TestMixin):
=== modified file 'tests/functional/openlp_plugins/presentations/test_mediaitem.py'
--- tests/functional/openlp_plugins/presentations/test_mediaitem.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/presentations/test_mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,10 +25,9 @@
from unittest import TestCase
from unittest.mock import patch, MagicMock, call
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
-from openlp.core.common.path import Path
from openlp.plugins.presentations.lib.mediaitem import PresentationMediaItem
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/presentations/test_messagelistener.py'
--- tests/functional/openlp_plugins/presentations/test_messagelistener.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/presentations/test_messagelistener.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,7 +28,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.presentations.lib.mediaitem import MessageListener, PresentationMediaItem
from openlp.plugins.presentations.lib.messagelistener import Controller
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/presentations/test_pdfcontroller.py'
--- tests/functional/openlp_plugins/presentations/test_pdfcontroller.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/presentations/test_pdfcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,20 +23,24 @@
This module contains tests for the PdfController
"""
import os
-import shutil
from tempfile import mkdtemp
from unittest import TestCase, SkipTest
from unittest.mock import MagicMock, patch
from PyQt5 import QtCore, QtGui
-from openlp.plugins.presentations.lib.pdfcontroller import PdfController, PdfDocument
+from openlp.core.common.path import Path
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
from openlp.core.display.screens import ScreenList
+<<<<<<< TREE
from tests.utils.constants import RESOURCE_PATH
from tests.helpers.testmixin import TestMixin
+=======
+from openlp.plugins.presentations.lib.pdfcontroller import PdfController, PdfDocument
+from tests.helpers.testmixin import TestMixin
+from tests.utils.constants import TEST_RESOURCES_PATH
+>>>>>>> MERGE-SOURCE
__default_settings__ = {
'presentations/enable_pdf_program': False,
=== modified file 'tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py'
--- tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py 2017-12-24 07:11:30 +0000
+++ tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,15 +24,14 @@
"""
import os
import shutil
+from tempfile import mkdtemp
from unittest import TestCase
from unittest.mock import patch, MagicMock
-from tempfile import mkdtemp
from openlp.core.common import is_win
from openlp.core.common.settings import Settings
from openlp.plugins.presentations.lib.powerpointcontroller import PowerpointController, PowerpointDocument, \
_get_text_from_shapes
-
from tests.helpers.testmixin import TestMixin
from tests.utils.constants import TEST_RESOURCES_PATH
=== modified file 'tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py'
--- tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,10 +27,9 @@
from unittest import TestCase, skipIf
from unittest.mock import MagicMock, patch
-from openlp.plugins.presentations.lib.pptviewcontroller import PptviewDocument, PptviewController
from openlp.core.common import is_win
from openlp.core.common.path import Path
-
+from openlp.plugins.presentations.lib.pptviewcontroller import PptviewDocument, PptviewController
from tests.helpers.testmixin import TestMixin
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/presentations/test_presentationcontroller.py'
--- tests/functional/openlp_plugins/presentations/test_presentationcontroller.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/presentations/test_presentationcontroller.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/__init__.py'
--- tests/functional/openlp_plugins/songs/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/songs/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_chordproimport.py'
--- tests/functional/openlp_plugins/songs/test_chordproimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_chordproimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_db.py'
--- tests/functional/openlp_plugins/songs/test_db.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/songs/test_db.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -24,12 +24,12 @@
"""
import os
import shutil
+from tempfile import mkdtemp
from unittest import TestCase
-from tempfile import mkdtemp
+from openlp.core.lib.db import upgrade_db
+from openlp.plugins.songs.lib import upgrade
from openlp.plugins.songs.lib.db import Song, Author, AuthorType, Book
-from openlp.plugins.songs.lib import upgrade
-from openlp.core.lib.db import upgrade_db
from tests.utils.constants import TEST_RESOURCES_PATH
=== modified file 'tests/functional/openlp_plugins/songs/test_easyslidesimport.py'
--- tests/functional/openlp_plugins/songs/test_easyslidesimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_easyslidesimport.py 2017-12-29 10:10:27 +0000
@@ -3,7 +3,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_editsongform.py'
--- tests/functional/openlp_plugins/songs/test_editsongform.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/songs/test_editsongform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.songs.forms.editsongform import EditSongForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/songs/test_editverseform.py'
--- tests/functional/openlp_plugins/songs/test_editverseform.py 2017-12-22 17:51:59 +0000
+++ tests/functional/openlp_plugins/songs/test_editverseform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.settings import Settings
from openlp.plugins.songs.forms.editverseform import EditVerseForm
-
from tests.helpers.testmixin import TestMixin
__default_settings__ = {
=== modified file 'tests/functional/openlp_plugins/songs/test_ewimport.py'
--- tests/functional/openlp_plugins/songs/test_ewimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_ewimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,7 +28,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.songs.lib.importers.easyworship import EasyWorshipSongImport, FieldDescEntry, FieldType
-
from tests.utils.constants import RESOURCE_PATH
TEST_PATH = RESOURCE_PATH / 'songs' / 'easyworship'
=== modified file 'tests/functional/openlp_plugins/songs/test_foilpresenterimport.py'
--- tests/functional/openlp_plugins/songs/test_foilpresenterimport.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_plugins/songs/test_foilpresenterimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_lib.py'
--- tests/functional/openlp_plugins/songs/test_lib.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/songs/test_lib.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_lyriximport.py'
--- tests/functional/openlp_plugins/songs/test_lyriximport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_lyriximport.py 2017-12-29 10:10:27 +0000
@@ -3,7 +3,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_mediaitem.py'
--- tests/functional/openlp_plugins/songs/test_mediaitem.py 2017-12-22 17:51:59 +0000
+++ tests/functional/openlp_plugins/songs/test_mediaitem.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -32,7 +32,6 @@
from openlp.core.lib import ServiceItem
from openlp.plugins.songs.lib.db import AuthorType, Song
from openlp.plugins.songs.lib.mediaitem import SongMediaItem
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/songs/test_mediashout.py'
--- tests/functional/openlp_plugins/songs/test_mediashout.py 2017-12-22 22:20:04 +0000
+++ tests/functional/openlp_plugins/songs/test_mediashout.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,6 +27,7 @@
from unittest.mock import MagicMock, patch, call
from openlp.core.common.registry import Registry
+
try:
from openlp.plugins.songs.lib.importers.mediashout import MediaShoutImport
CAN_RUN_TESTS = True
=== modified file 'tests/functional/openlp_plugins/songs/test_openlpimporter.py'
--- tests/functional/openlp_plugins/songs/test_openlpimporter.py 2017-12-23 09:30:02 +0000
+++ tests/functional/openlp_plugins/songs/test_openlpimporter.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_openlyricsexport.py'
--- tests/functional/openlp_plugins/songs/test_openlyricsexport.py 2017-12-22 17:51:59 +0000
+++ tests/functional/openlp_plugins/songs/test_openlyricsexport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,10 +26,9 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
-from openlp.core.common.path import Path
from openlp.plugins.songs.lib.openlyricsexport import OpenLyricsExport
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/songs/test_openlyricsimport.py'
--- tests/functional/openlp_plugins/songs/test_openlyricsimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_openlyricsimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -33,7 +33,6 @@
from openlp.plugins.songs.lib.importers.openlyrics import OpenLyricsImport
from openlp.plugins.songs.lib.importers.songimport import SongImport
from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics
-
from tests.helpers.testmixin import TestMixin
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/songs/test_openoffice.py'
--- tests/functional/openlp_plugins/songs/test_openoffice.py 2017-12-22 17:51:59 +0000
+++ tests/functional/openlp_plugins/songs/test_openoffice.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,7 +26,6 @@
from unittest.mock import MagicMock, patch
from openlp.core.common.registry import Registry
-
from tests.helpers.testmixin import TestMixin
try:
=== modified file 'tests/functional/openlp_plugins/songs/test_opensongimport.py'
--- tests/functional/openlp_plugins/songs/test_opensongimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_opensongimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.songs.lib.importers.opensong import OpenSongImport
-
from tests.helpers.songfileimport import SongImportTestHelper
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/songs/test_opsproimport.py'
--- tests/functional/openlp_plugins/songs/test_opsproimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_opsproimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_powerpraiseimport.py'
--- tests/functional/openlp_plugins/songs/test_powerpraiseimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_powerpraiseimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py'
--- tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_propresenterimport.py'
--- tests/functional/openlp_plugins/songs/test_propresenterimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_propresenterimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_songbeamerimport.py'
--- tests/functional/openlp_plugins/songs/test_songbeamerimport.py 2017-12-24 08:52:53 +0000
+++ tests/functional/openlp_plugins/songs/test_songbeamerimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.songs.lib.importers.songbeamer import SongBeamerImport, SongBeamerTypes
-
from tests.helpers.songfileimport import SongImportTestHelper
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/songs/test_songproimport.py'
--- tests/functional/openlp_plugins/songs/test_songproimport.py 2017-12-24 08:52:53 +0000
+++ tests/functional/openlp_plugins/songs/test_songproimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_songselect.py'
--- tests/functional/openlp_plugins/songs/test_songselect.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_songselect.py 2017-12-29 10:10:27 +0000
@@ -5,7 +5,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -33,7 +33,6 @@
from openlp.plugins.songs.forms.songselectform import SongSelectForm, SearchWorker
from openlp.plugins.songs.lib import Song
from openlp.plugins.songs.lib.songselect import SongSelectImport, LOGOUT_URL, BASE_URL
-
from tests.helpers.songfileimport import SongImportTestHelper
from tests.helpers.testmixin import TestMixin
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/songs/test_songshowplusimport.py'
--- tests/functional/openlp_plugins/songs/test_songshowplusimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_songshowplusimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.plugins.songs.lib import VerseType
from openlp.plugins.songs.lib.importers.songshowplus import SongShowPlusImport
-
from tests.helpers.songfileimport import SongImportTestHelper
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/songs/test_sundayplusimport.py'
--- tests/functional/openlp_plugins/songs/test_sundayplusimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_sundayplusimport.py 2017-12-29 10:10:27 +0000
@@ -3,7 +3,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_videopsalm.py'
--- tests/functional/openlp_plugins/songs/test_videopsalm.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_videopsalm.py 2017-12-29 10:10:27 +0000
@@ -3,7 +3,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py'
--- tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_worshipassistantimport.py'
--- tests/functional/openlp_plugins/songs/test_worshipassistantimport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_worshipassistantimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py'
--- tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py 2017-12-22 17:51:59 +0000
+++ tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songs/test_zionworximport.py'
--- tests/functional/openlp_plugins/songs/test_zionworximport.py 2017-12-24 08:42:46 +0000
+++ tests/functional/openlp_plugins/songs/test_zionworximport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,7 +28,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.songs.lib.importers.songimport import SongImport
from openlp.plugins.songs.lib.importers.zionworx import ZionWorxImport
-
from tests.helpers.songfileimport import SongImportTestHelper
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/songusage/__init__.py'
--- tests/functional/openlp_plugins/songusage/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_plugins/songusage/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/functional/openlp_plugins/songusage/test_songusage.py'
--- tests/functional/openlp_plugins/songusage/test_songusage.py 2017-12-23 09:22:53 +0000
+++ tests/functional/openlp_plugins/songusage/test_songusage.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/helpers/__init__.py'
--- tests/helpers/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/helpers/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/helpers/songfileimport.py'
--- tests/helpers/songfileimport.py 2017-12-24 07:40:07 +0000
+++ tests/helpers/songfileimport.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/helpers/testmixin.py'
--- tests/helpers/testmixin.py 2017-10-07 07:05:07 +0000
+++ tests/helpers/testmixin.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -26,6 +26,7 @@
from tempfile import mkstemp
from PyQt5 import QtCore, QtWidgets
+
from openlp.core.common.settings import Settings
=== modified file 'tests/interfaces/__init__.py'
--- tests/interfaces/__init__.py 2017-05-08 18:33:11 +0000
+++ tests/interfaces/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/__init__.py'
--- tests/interfaces/openlp_core/__init__.py 2017-10-23 22:09:57 +0000
+++ tests/interfaces/openlp_core/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/api/__init__.py'
--- tests/interfaces/openlp_core/api/__init__.py 2017-03-05 17:07:21 +0000
+++ tests/interfaces/openlp_core/api/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/common/__init__.py'
--- tests/interfaces/openlp_core/common/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_core/common/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/common/test_utils.py'
--- tests/interfaces/openlp_core/common/test_utils.py 2017-12-24 08:42:46 +0000
+++ tests/interfaces/openlp_core/common/test_utils.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,9 +25,15 @@
from unittest import TestCase
from openlp.core.common import is_not_image_file
+<<<<<<< TREE
from tests.utils.constants import RESOURCE_PATH
from tests.helpers.testmixin import TestMixin
+=======
+from openlp.core.common.path import Path
+from tests.helpers.testmixin import TestMixin
+from tests.utils.constants import TEST_RESOURCES_PATH
+>>>>>>> MERGE-SOURCE
class TestUtils(TestCase, TestMixin):
=== modified file 'tests/interfaces/openlp_core/lib/__init__.py'
--- tests/interfaces/openlp_core/lib/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_core/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/lib/test_pluginmanager.py'
--- tests/interfaces/openlp_core/lib/test_pluginmanager.py 2017-12-23 09:22:53 +0000
+++ tests/interfaces/openlp_core/lib/test_pluginmanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,19 +22,18 @@
"""
Package to test the openlp.core.lib.pluginmanager package.
"""
+import gc
import sys
-import gc
from tempfile import mkdtemp
from unittest import TestCase
from unittest.mock import MagicMock, patch
from PyQt5 import QtWidgets
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
from openlp.core.lib.pluginmanager import PluginManager
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/__init__.py'
--- tests/interfaces/openlp_core/ui/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_core/ui/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/ui/lib/__init__.py'
--- tests/interfaces/openlp_core/ui/lib/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_core/ui/lib/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/ui/media/__init__.py'
--- tests/interfaces/openlp_core/ui/media/__init__.py 2017-10-23 22:09:57 +0000
+++ tests/interfaces/openlp_core/ui/media/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/ui/media/vendor/__init__.py'
--- tests/interfaces/openlp_core/ui/media/vendor/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_core/ui/media/vendor/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/ui/media/vendor/test_mediainfoWrapper.py'
--- tests/interfaces/openlp_core/ui/media/vendor/test_mediainfoWrapper.py 2017-12-24 07:40:07 +0000
+++ tests/interfaces/openlp_core/ui/media/vendor/test_mediainfoWrapper.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,7 +25,6 @@
from unittest import TestCase
from openlp.core.ui.media.vendor.mediainfoWrapper import MediaInfoWrapper
-
from tests.utils.constants import RESOURCE_PATH
TEST_PATH = RESOURCE_PATH / 'media'
=== modified file 'tests/interfaces/openlp_core/ui/test_filerenamedialog.py'
--- tests/interfaces/openlp_core/ui/test_filerenamedialog.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/ui/test_filerenamedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.registry import Registry
from openlp.core.ui import filerenameform
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_mainwindow.py'
--- tests/interfaces/openlp_core/ui/test_mainwindow.py 2017-10-07 07:05:07 +0000
+++ tests/interfaces/openlp_core/ui/test_mainwindow.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -27,7 +27,6 @@
from openlp.core.common.registry import Registry
from openlp.core.ui.mainwindow import MainWindow
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_projectoreditform.py'
--- tests/interfaces/openlp_core/ui/test_projectoreditform.py 2017-11-16 23:53:53 +0000
+++ tests/interfaces/openlp_core/ui/test_projectoreditform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,10 +30,8 @@
from openlp.core.common.registry import Registry
from openlp.core.projectors.db import Projector, ProjectorDB
from openlp.core.projectors.editform import ProjectorEditForm
-from openlp.core.projectors.manager import ProjectorManager
-
from tests.helpers.testmixin import TestMixin
-from tests.resources.projector.data import TEST_DB, TEST1_DATA, TEST2_DATA
+from tests.resources.projector.data import TEST_DB, TEST1_DATA
class TestProjectorEditForm(TestCase, TestMixin):
=== modified file 'tests/interfaces/openlp_core/ui/test_projectormanager.py'
--- tests/interfaces/openlp_core/ui/test_projectormanager.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/ui/test_projectormanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,7 +30,6 @@
from openlp.core.projectors.db import ProjectorDB
from openlp.core.projectors.editform import ProjectorEditForm
from openlp.core.projectors.manager import ProjectorManager
-
from tests.helpers.testmixin import TestMixin
from tests.resources.projector.data import TEST_DB
=== modified file 'tests/interfaces/openlp_core/ui/test_projectorsourceform.py'
--- tests/interfaces/openlp_core/ui/test_projectorsourceform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/ui/test_projectorsourceform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -32,10 +32,9 @@
from PyQt5.QtWidgets import QDialog
from openlp.core.common.registry import Registry
+from openlp.core.projectors.constants import PJLINK_DEFAULT_CODES, PJLINK_DEFAULT_SOURCES
from openlp.core.projectors.db import ProjectorDB, Projector
-from openlp.core.projectors.constants import PJLINK_DEFAULT_CODES, PJLINK_DEFAULT_SOURCES
from openlp.core.projectors.sourceselectform import source_group, SourceSelectSingle
-
from tests.helpers.testmixin import TestMixin
from tests.resources.projector.data import TEST_DB, TEST1_DATA
=== modified file 'tests/interfaces/openlp_core/ui/test_servicemanager.py'
--- tests/interfaces/openlp_core/ui/test_servicemanager.py 2017-12-23 09:22:53 +0000
+++ tests/interfaces/openlp_core/ui/test_servicemanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,7 +30,6 @@
from openlp.core.common.registry import Registry
from openlp.core.lib import ServiceItem, ItemCapabilities
from openlp.core.ui.servicemanager import ServiceManager
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_servicenotedialog.py'
--- tests/interfaces/openlp_core/ui/test_servicenotedialog.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/ui/test_servicenotedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.registry import Registry
from openlp.core.ui import servicenoteform
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_settings_form.py'
--- tests/interfaces/openlp_core/ui/test_settings_form.py 2017-10-10 07:08:44 +0000
+++ tests/interfaces/openlp_core/ui/test_settings_form.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,9 +28,8 @@
from PyQt5 import QtCore, QtTest
from openlp.core.common.registry import Registry
+from openlp.core.display.screens import ScreenList
from openlp.core.ui import settingsform
-from openlp.core.display.screens import ScreenList
-
from tests.helpers.testmixin import TestMixin
SCREEN = {
=== modified file 'tests/interfaces/openlp_core/ui/test_shortcutlistform.py'
--- tests/interfaces/openlp_core/ui/test_shortcutlistform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/ui/test_shortcutlistform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.registry import Registry
from openlp.core.ui.shortcutlistform import ShortcutListForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_starttimedialog.py'
--- tests/interfaces/openlp_core/ui/test_starttimedialog.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/ui/test_starttimedialog.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.registry import Registry
from openlp.core.ui import starttimeform
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_thememanager.py'
--- tests/interfaces/openlp_core/ui/test_thememanager.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/ui/test_thememanager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -25,11 +25,10 @@
from unittest import TestCase
from unittest.mock import patch, MagicMock
+from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.common.path import Path
from openlp.core.ui import ThemeManager
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/widgets/__init__.py'
--- tests/interfaces/openlp_core/widgets/__init__.py 2017-10-23 22:09:57 +0000
+++ tests/interfaces/openlp_core/widgets/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_core/widgets/test_edits.py'
--- tests/interfaces/openlp_core/widgets/test_edits.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/widgets/test_edits.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.registry import Registry
from openlp.core.widgets.edits import SearchEdit, HistoryComboBox
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/widgets/test_views.py'
--- tests/interfaces/openlp_core/widgets/test_views.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_core/widgets/test_views.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,9 +30,8 @@
from openlp.core.common.registry import Registry
from openlp.core.lib import ServiceItem
from openlp.core.widgets.views import ListPreviewWidget
-
+from tests.helpers.testmixin import TestMixin
from tests.utils.osdinteraction import read_service_from_file
-from tests.helpers.testmixin import TestMixin
class TestListPreviewWidget(TestCase, TestMixin):
=== modified file 'tests/interfaces/openlp_plugins/__init__.py'
--- tests/interfaces/openlp_plugins/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/bibles/__init__.py'
--- tests/interfaces/openlp_plugins/bibles/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/bibles/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/bibles/forms/__init__.py'
--- tests/interfaces/openlp_plugins/bibles/forms/__init__.py 2017-04-25 18:54:18 +0000
+++ tests/interfaces/openlp_plugins/bibles/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2018 OpenLP Developers #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
=== modified file 'tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py'
--- tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,8 +28,7 @@
from PyQt5 import QtWidgets
from openlp.core.common.registry import Registry
-from openlp.plugins.bibles.forms.bibleimportform import BibleImportForm, PYSWORD_AVAILABLE
-
+from openlp.plugins.bibles.forms.bibleimportform import BibleImportForm
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_plugins/bibles/test_lib_http.py'
--- tests/interfaces/openlp_plugins/bibles/test_lib_http.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/bibles/test_lib_http.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/bibles/test_lib_manager.py'
--- tests/interfaces/openlp_plugins/bibles/test_lib_manager.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/bibles/test_lib_manager.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,9 +28,8 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.plugins.bibles.lib import BibleManager, LanguageSelection
-
+from tests.helpers.testmixin import TestMixin
from tests.utils.constants import TEST_RESOURCES_PATH
-from tests.helpers.testmixin import TestMixin
class TestBibleManager(TestCase, TestMixin):
=== modified file 'tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py'
--- tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,9 +28,8 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.plugins.bibles.lib import BibleManager, parse_reference, LanguageSelection
-
+from tests.helpers.testmixin import TestMixin
from tests.utils.constants import TEST_RESOURCES_PATH
-from tests.helpers.testmixin import TestMixin
class TestBibleManager(TestCase, TestMixin):
=== modified file 'tests/interfaces/openlp_plugins/custom/__init__.py'
--- tests/interfaces/openlp_plugins/custom/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/custom/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/custom/forms/__init__.py'
--- tests/interfaces/openlp_plugins/custom/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/custom/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/custom/forms/test_customform.py'
--- tests/interfaces/openlp_plugins/custom/forms/test_customform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/custom/forms/test_customform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -28,9 +28,7 @@
from PyQt5 import QtTest, QtCore, QtWidgets
from openlp.core.common.registry import Registry
-from openlp.plugins.custom.lib.mediaitem import CustomMediaItem
from openlp.plugins.custom.forms.editcustomform import EditCustomForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_plugins/custom/forms/test_customslideform.py'
--- tests/interfaces/openlp_plugins/custom/forms/test_customslideform.py 2017-10-07 07:05:07 +0000
+++ tests/interfaces/openlp_plugins/custom/forms/test_customslideform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -29,7 +29,6 @@
from openlp.core.common.registry import Registry
from openlp.plugins.custom.forms.editcustomslideform import EditCustomSlideForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_plugins/media/__init__.py'
--- tests/interfaces/openlp_plugins/media/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/media/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/media/forms/__init__.py'
--- tests/interfaces/openlp_plugins/media/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/media/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py'
--- tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py 2017-10-07 07:05:07 +0000
+++ tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/songs/__init__.py'
--- tests/interfaces/openlp_plugins/songs/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/songs/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/songs/forms/__init__.py'
--- tests/interfaces/openlp_plugins/songs/forms/__init__.py 2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_authorsform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_authorsform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_authorsform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -31,7 +31,6 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.plugins.songs.forms.editsongform import EditSongForm
-
from tests.helpers.testmixin import TestMixin
__default_settings__ = {
=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py 2017-10-07 07:05:07 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -30,7 +30,6 @@
from openlp.core.common.i18n import UiStrings
from openlp.core.common.registry import Registry
from openlp.plugins.songs.forms.songmaintenanceform import SongMaintenanceForm
-
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_topicsform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_topicsform.py 2017-12-23 09:09:45 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_topicsform.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
=== modified file 'tests/resources/projector/data.py'
--- tests/resources/projector/data.py 2017-05-27 18:21:24 +0000
+++ tests/resources/projector/data.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,9 +23,6 @@
The :mod:`tests.resources.projector.data file contains test data
"""
-import os
-from tempfile import gettempdir
-
# Test data
TEST_DB_PJLINK1 = 'projector_pjlink1.sqlite'
=== modified file 'tests/utils/__init__.py'
--- tests/utils/__init__.py 2017-12-23 23:45:10 +0000
+++ tests/utils/__init__.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -19,8 +19,8 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import json
import os
-import json
def assert_length(expected, iterable, msg=None):
=== modified file 'tests/utils/constants.py'
--- tests/utils/constants.py 2017-12-22 21:20:49 +0000
+++ tests/utils/constants.py 2017-12-29 10:10:27 +0000
@@ -1,4 +1,24 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2018 OpenLP Developers #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
import os
from openlp.core.common.path import Path
=== modified file 'tests/utils/osdinteraction.py'
--- tests/utils/osdinteraction.py 2016-12-31 11:01:36 +0000
+++ tests/utils/osdinteraction.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,8 +23,8 @@
The :mod:`osdinteraction` provides miscellaneous functions for interacting with
OSD files.
"""
+import json
import os
-import json
from tests.utils.constants import TEST_RESOURCES_PATH
=== modified file 'tests/utils/test_bzr_tags.py'
--- tests/utils/test_bzr_tags.py 2017-12-23 09:09:45 +0000
+++ tests/utils/test_bzr_tags.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -23,10 +23,9 @@
Package to test for proper bzr tags.
"""
import os
+from subprocess import Popen, PIPE
from unittest import TestCase
-from subprocess import Popen, PIPE
-
TAGS1 = {'1.9.0', '1.9.1', '1.9.2', '1.9.3', '1.9.4', '1.9.5', '1.9.6', '1.9.7', '1.9.8', '1.9.9', '1.9.10',
'1.9.11', '1.9.12', '2.0', '2.1.0', '2.1.1', '2.1.2', '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.2',
'2.3.1', '2.3.2', '2.3.3', '2.4'}
=== modified file 'tests/utils/test_pylint.py'
--- tests/utils/test_pylint.py 2017-12-23 09:09:45 +0000
+++ tests/utils/test_pylint.py 2017-12-29 10:10:27 +0000
@@ -4,7 +4,7 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers #
+# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free #
@@ -22,7 +22,6 @@
"""
Package to test for proper bzr tags.
"""
-import os
import platform
import sys
from unittest import TestCase, SkipTest
Follow ups
