diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index ff4f8234b..ce920d598 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -34,7 +34,6 @@ import logging import os from urllib import quote_plus as urlquote -from PyQt4 import QtCore from sqlalchemy import Table, MetaData, Column, types, create_engine from sqlalchemy.exc import SQLAlchemyError, InvalidRequestError, DBAPIError, OperationalError from sqlalchemy.orm import scoped_session, sessionmaker, mapper diff --git a/openlp/core/lib/formattingtags.py b/openlp/core/lib/formattingtags.py index 594a4322e..eb52dc26f 100644 --- a/openlp/core/lib/formattingtags.py +++ b/openlp/core/lib/formattingtags.py @@ -31,8 +31,6 @@ Provide HTML Tag management and Formatting Tag access class """ import cPickle -from PyQt4 import QtCore - from openlp.core.lib import translate, Settings class FormattingTags(object): diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 00670d490..a9d3c2d62 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -37,7 +37,7 @@ import logging import os import uuid -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, ImageSource, Settings diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index e117a0809..132465b2e 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -29,9 +29,7 @@ """ The :mod:`ui` module provides the core user interface for OpenLP """ -from PyQt4 import QtGui -from openlp.core.lib import translate class HideMode(object): """ diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index bb127be43..76a92938d 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, build_icon +from openlp.core.lib import translate from openlp.core.lib.ui import create_button, create_button_box class Ui_ExceptionDialog(object): diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 55e94e3a6..2807f215a 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -31,7 +31,7 @@ The :mod:`settingsform` provides a user interface for the OpenLP settings """ import logging -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui from openlp.core.lib import Receiver, build_icon, PluginStatus from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab @@ -141,4 +141,4 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): """ if self.resetSuffixes: self.mainWindow.serviceManagerContents.resetSupportedSuffixes() - self.resetSuffixes = False \ No newline at end of file + self.resetSuffixes = False diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 8e8f8c458..f22fc8bf8 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -29,7 +29,7 @@ import logging -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings from openlp.core.lib.ui import create_action, UiStrings diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 7346fc697..01314ddc9 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -34,7 +34,7 @@ import logging import re from openlp.core.lib import translate, Settings -from openlp.plugins.bibles.lib.db import BiblesResourcesDB + log = logging.getLogger(__name__) diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 15250223c..1fa07ba86 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -30,8 +30,6 @@ import logging import os -from PyQt4 import QtCore - from openlp.core.lib import Receiver, SettingsManager, translate, Settings from openlp.core.utils import AppLocation, delete_file from openlp.plugins.bibles.lib import parse_reference, get_reference_separator, LanguageSelection diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index fb9a5b9ea..3063bfa7b 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -28,7 +28,6 @@ ############################################################################### import logging -import os from PyQt4 import QtCore diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py index c9328b31c..39ecb0ae2 100644 --- a/openlp/plugins/songs/lib/__init__.py +++ b/openlp/plugins/songs/lib/__init__.py @@ -28,7 +28,7 @@ ############################################################################### import re -from PyQt4 import QtGui, QtCore +from PyQt4 import QtGui from openlp.core.lib import translate from openlp.core.utils import CONTROL_CHARS, locale_direct_compare diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py index 9c425b9d7..db5f59357 100644 --- a/openlp/plugins/songs/lib/db.py +++ b/openlp/plugins/songs/lib/db.py @@ -36,7 +36,6 @@ import re from sqlalchemy import Column, ForeignKey, Table, types from sqlalchemy.orm import mapper, relation, reconstructor from sqlalchemy.sql.expression import func -from PyQt4 import QtCore from openlp.core.lib.db import BaseModel, init_db diff --git a/openlp/plugins/songs/lib/dreambeamimport.py b/openlp/plugins/songs/lib/dreambeamimport.py index 759f8b055..4f8d343c4 100644 --- a/openlp/plugins/songs/lib/dreambeamimport.py +++ b/openlp/plugins/songs/lib/dreambeamimport.py @@ -30,8 +30,6 @@ The :mod:`dreambeamimport` module provides the functionality for importing DreamBeam songs into the OpenLP database. """ -import os -import sys import logging from lxml import etree, objectify @@ -46,11 +44,11 @@ class DreamBeamImport(SongImport): """ The :class:`DreamBeamImport` class provides the ability to import song files from DreamBeam. - + An example of DreamBeam xml mark-up:: - + - false 0.80 @@ -84,7 +82,7 @@ class DreamBeamImport(SongImport): * \*.xml """ - + def doImport(self): """ Receive a single file or a list of files to import. diff --git a/openlp/plugins/songs/lib/mediashoutimport.py b/openlp/plugins/songs/lib/mediashoutimport.py index 5f6cf6276..e3358c044 100644 --- a/openlp/plugins/songs/lib/mediashoutimport.py +++ b/openlp/plugins/songs/lib/mediashoutimport.py @@ -30,8 +30,6 @@ The :mod:`mediashoutimport` module provides the functionality for importing a MediaShout database into the OpenLP database. """ -import re -import os import pyodbc from openlp.core.lib import translate diff --git a/openlp/plugins/songs/lib/songproimport.py b/openlp/plugins/songs/lib/songproimport.py index 52ac79431..7556454d8 100644 --- a/openlp/plugins/songs/lib/songproimport.py +++ b/openlp/plugins/songs/lib/songproimport.py @@ -31,9 +31,7 @@ The :mod:`songproimport` module provides the functionality for importing SongPro songs into the OpenLP database. """ import re -import os -from openlp.core.lib import translate from openlp.plugins.songs.lib import strip_rtf from openlp.plugins.songs.lib.songimport import SongImport