openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

    Requested reviews:
    Tim Bentley (trb143)

-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/12419
Your team openlp.org Core is subscribed to branch lp:openlp.

=== modified file 'cnvdb.py'
--- cnvdb.py	2009-09-08 19:58:05 +0000
+++ cnvdb.py	2009-09-25 14:20:28 +0000
@@ -25,7 +25,6 @@
 
 import codecs
 import sys
-import chardet
 
 def convert_file(inname, outname):
     """

=== modified file 'demo.py'
--- demo.py	2009-09-08 19:58:05 +0000
+++ demo.py	2009-09-25 14:20:28 +0000
@@ -25,7 +25,7 @@
 import sys
 import time
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
 
 from openlp.core import Renderer
 from openlp.theme import Theme

=== modified file 'documentation/source/conf.py'
--- documentation/source/conf.py	2009-09-03 21:41:34 +0000
+++ documentation/source/conf.py	2009-09-25 14:20:28 +0000
@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

=== modified file 'openlp/core/lib/baselistwithdnd.py'
--- openlp/core/lib/baselistwithdnd.py	2009-09-12 17:24:16 +0000
+++ openlp/core/lib/baselistwithdnd.py	2009-09-25 14:20:28 +0000
@@ -22,12 +22,9 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import types
-
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib.toolbar import *
-from openlp.core.lib import translate
 
 class BaseListWithDnD(QtGui.QListWidget):
     """

=== modified file 'openlp/core/lib/dockwidget.py'
--- openlp/core/lib/dockwidget.py	2009-09-19 11:25:01 +0000
+++ openlp/core/lib/dockwidget.py	2009-09-25 14:20:28 +0000
@@ -22,10 +22,9 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import types
 import logging
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
 class OpenLPDockWidget(QtGui.QDockWidget):
     """

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2009-09-21 23:11:50 +0000
+++ openlp/core/lib/renderer.py	2009-09-25 14:20:28 +0000
@@ -23,8 +23,6 @@
 ###############################################################################
 
 import logging
-import os
-import sys
 
 from PyQt4 import QtGui, QtCore
 

=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py	2009-09-21 23:11:50 +0000
+++ openlp/core/lib/rendermanager.py	2009-09-25 14:20:28 +0000
@@ -23,9 +23,6 @@
 ###############################################################################
 
 import logging
-import os
-import sys
-import linecache
 
 from PyQt4 import QtGui, QtCore
 

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2009-09-21 23:11:50 +0000
+++ openlp/core/lib/serviceitem.py	2009-09-25 14:20:28 +0000
@@ -24,9 +24,8 @@
 
 import logging
 import os
-import time
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
 from openlp.core.lib import buildIcon
 

=== modified file 'openlp/core/lib/settingstab.py'
--- openlp/core/lib/settingstab.py	2009-09-08 19:58:05 +0000
+++ openlp/core/lib/settingstab.py	2009-09-25 14:20:28 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
 from openlp.core.lib import PluginConfig
 

=== modified file 'openlp/core/lib/themexmlhandler.py'
--- openlp/core/lib/themexmlhandler.py	2009-09-08 19:58:05 +0000
+++ openlp/core/lib/themexmlhandler.py	2009-09-25 14:20:28 +0000
@@ -25,7 +25,7 @@
 import os
 
 from xml.dom.minidom import Document
-from xml.etree.ElementTree import ElementTree, XML, dump
+from xml.etree.ElementTree import ElementTree, XML
 
 from openlp.core.lib import str_to_bool
 

=== modified file 'openlp/core/lib/xmlrootclass.py'
--- openlp/core/lib/xmlrootclass.py	2009-09-08 19:58:05 +0000
+++ openlp/core/lib/xmlrootclass.py	2009-09-25 14:20:28 +0000
@@ -22,9 +22,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import platform
+import os
 import sys
-import os
 from types import StringType, NoneType, UnicodeType
 
 from xml.etree.ElementTree import ElementTree, XML

=== modified file 'openlp/core/test/test_mediamanageritem.py'
--- openlp/core/test/test_mediamanageritem.py	2009-09-03 15:19:30 +0000
+++ openlp/core/test/test_mediamanageritem.py	2009-09-25 14:20:28 +0000
@@ -1,5 +1,11 @@
+import logging
+import os
+import sys
+
 from PyQt4 import QtCore, QtGui
-import logging
+
+from openlp.core.lib import MediaManagerItem
+
 logging.basicConfig(level=logging.DEBUG,
                 format='%(asctime)s %(name)-30s %(levelname)-8s %(message)s',
                 datefmt='%m-%d %H:%M',
@@ -12,14 +18,11 @@
 # tell the handler to use this format
 console.setFormatter(formatter)
 logging.getLogger(u'').addHandler(console)
-log=logging.getLogger(u'')
-
+log = logging.getLogger(u'')
 logging.info(u'Logging started')
-import os, sys
-mypath=os.path.split(os.path.abspath(__file__))[0]
-
+mypath = os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
-from openlp.core.lib import MediaManagerItem
+
 class TestMediaManager:
     def setup_class(self):
         self.app = QtGui.QApplication([])

=== modified file 'openlp/core/test/test_plugin_manager.py'
--- openlp/core/test/test_plugin_manager.py	2009-09-06 13:57:32 +0000
+++ openlp/core/test/test_plugin_manager.py	2009-09-25 14:20:28 +0000
@@ -1,5 +1,7 @@
 import logging
-import os, sys
+import os
+import sys
+
 from openlp.core.lib.pluginmanager import PluginManager
 
 logging.basicConfig(level=logging.DEBUG,
@@ -14,11 +16,9 @@
 # tell the handler to use this format
 console.setFormatter(formatter)
 logging.getLogger(u'').addHandler(console)
-log=logging.getLogger(u'')
-
+log = logging.getLogger(u'')
 logging.info(u'Logging started')
-mypath=os.path.split(os.path.abspath(__file__))[0]
-
+mypath = os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
 
 # test the plugin manager with some plugins in the test_plugins directory

=== modified file 'openlp/core/test/test_render.py'
--- openlp/core/test/test_render.py	2009-09-06 15:26:02 +0000
+++ openlp/core/test/test_render.py	2009-09-25 14:20:28 +0000
@@ -16,9 +16,9 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import time
 import sys
 import os, os.path
+
 from PyQt4 import QtGui, QtCore
 
 from openlp.core.theme import Theme

=== modified file 'openlp/core/test/test_render_theme.py'
--- openlp/core/test/test_render_theme.py	2009-09-06 15:26:02 +0000
+++ openlp/core/test/test_render_theme.py	2009-09-25 14:20:28 +0000
@@ -21,7 +21,6 @@
 from PyQt4 import QtGui, QtCore
 
 from openlp.core.theme import Theme
-from openlp.core import Renderer
 from test_render import TestRender_base, whoami
 
 pypath = os.path.split(os.path.abspath(__file__))[0]

=== modified file 'openlp/core/theme/theme.py'
--- openlp/core/theme/theme.py	2009-09-08 19:58:05 +0000
+++ openlp/core/theme/theme.py	2009-09-25 14:20:28 +0000
@@ -22,10 +22,9 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import platform
 import types
+
 from xml.etree.ElementTree import ElementTree, XML
-
 from PyQt4 import QtGui
 
 DelphiColors={"clRed":0xFF0000,

=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py	2009-09-21 17:56:36 +0000
+++ openlp/core/ui/__init__.py	2009-09-25 14:20:28 +0000
@@ -38,6 +38,6 @@
 from thememanager import ThemeManager
 from mainwindow import MainWindow
 
-__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar',
-           'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager',
-           'ThemeManager', 'AmendThemeForm']
+__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
+    'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
+    'AmendThemeForm']

=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py	2009-09-24 01:37:21 +0000
+++ openlp/core/ui/amendthemeform.py	2009-09-25 14:20:28 +0000
@@ -26,9 +26,8 @@
 import os, os.path
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import ThemeXML, Renderer, file_to_xml, str_to_bool, \
-    translate
 
+from openlp.core.lib import ThemeXML, file_to_xml, translate
 from amendthemedialog import Ui_AmendThemeDialog
 
 log = logging.getLogger(u'AmendThemeForm')

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2009-09-21 19:26:10 +0000
+++ openlp/core/ui/maindisplay.py	2009-09-25 14:20:28 +0000
@@ -25,8 +25,7 @@
 import logging
 from PyQt4 import QtCore, QtGui
 
-from time import sleep
-from openlp.core.lib import translate, Receiver
+from openlp.core.lib import Receiver
 
 class MainDisplay(QtGui.QWidget):
     """

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2009-09-23 18:49:26 +0000
+++ openlp/core/ui/mainwindow.py	2009-09-25 14:20:28 +0000
@@ -30,11 +30,9 @@
 from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
     ServiceManager, ThemeManager, MainDisplay, SlideController, \
     PluginForm
-from openlp.core.lib import translate, Plugin, MediaManagerItem, \
-    SettingsTab, RenderManager, PluginConfig, str_to_bool, OpenLPDockWidget, \
-    SettingsManager, PluginManager, Receiver
+from openlp.core.lib import translate, RenderManager, PluginConfig, \
+    OpenLPDockWidget, SettingsManager, PluginManager, Receiver
 
-from openlp.core.utils import ConfigHelper
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2009-09-21 17:56:36 +0000
+++ openlp/core/ui/servicemanager.py	2009-09-25 14:20:28 +0000
@@ -23,18 +23,14 @@
 ###############################################################################
 
 import os
-import sys
 import string
 import logging
 import cPickle
 import zipfile
-import shutil
 
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
-    RenderManager, translate, buildIcon, ServiceType, \
-    contextMenuAction, contextMenuSeparator, Receiver
-from openlp.core.utils import ConfigHelper
+    translate, ServiceType, contextMenuAction, contextMenuSeparator, Receiver
 
 class ServiceManagerList(QtGui.QTreeWidget):
 

=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2009-09-20 15:45:33 +0000
+++ openlp/core/ui/settingsform.py	2009-09-25 14:20:28 +0000
@@ -24,9 +24,8 @@
 
 import logging
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab
 from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
 from settingsdialog import Ui_SettingsDialog
 

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2009-09-21 17:56:36 +0000
+++ openlp/core/ui/slidecontroller.py	2009-09-25 14:20:28 +0000
@@ -23,12 +23,10 @@
 ###############################################################################
 
 import logging
-import os
 import time
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import OpenLPToolbar, translate, buildIcon, Receiver, \
-    ServiceType, RenderManager, SettingsManager
+from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType
 
 class SlideList(QtGui.QTableWidget):
     """

=== modified file 'openlp/core/ui/test/test_service_manager.py'
--- openlp/core/ui/test/test_service_manager.py	2009-09-19 21:45:50 +0000
+++ openlp/core/ui/test/test_service_manager.py	2009-09-25 14:20:28 +0000
@@ -16,20 +16,18 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import time
 import sys
 import os, os.path
 import logging
-from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+
+from PyQt4 import QtGui
+
+from openlp.core.ui import ServiceManager
+from openlp.plugins.images.lib import ImageServiceItem
 
 mypath = os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0, (os.path.join(mypath, '..', '..', '..', '..')))
 
-from openlp.core.ui import ServiceManager
-from openlp.plugins.images.lib import ImageServiceItem
-
 logging.basicConfig(filename='test_service_manager.log', level=logging.INFO,
     filemode='w')
 

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2009-09-24 01:37:21 +0000
+++ openlp/core/ui/thememanager.py	2009-09-25 14:20:28 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 import os
-import sys
 import zipfile
 import shutil
 import logging
@@ -31,10 +30,10 @@
 from xml.etree.ElementTree import ElementTree, XML
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.ui import AmendThemeForm, ServiceManager
+from openlp.core.ui import AmendThemeForm
 from openlp.core.theme import Theme
-from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, Renderer, \
-        translate, str_to_bool, file_to_xml, buildIcon, Receiver
+from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, translate, \
+    str_to_bool, file_to_xml, buildIcon, Receiver
 from openlp.core.utils import ConfigHelper
 
 class ThemeManager(QtGui.QWidget):

=== modified file 'openlp/core/utils/registry.py'
--- openlp/core/utils/registry.py	2009-09-08 19:58:05 +0000
+++ openlp/core/utils/registry.py	2009-09-25 14:20:28 +0000
@@ -23,7 +23,7 @@
 ###############################################################################
 
 import os
-import sys
+
 from ConfigParser import SafeConfigParser
 
 class Registry(object):

=== modified file 'openlp/migration/migratebibles.py'
--- openlp/migration/migratebibles.py	2009-09-08 19:58:05 +0000
+++ openlp/migration/migratebibles.py	2009-09-25 14:20:28 +0000
@@ -22,8 +22,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import logging
-
 class MigrateBibles():
     def __init__(self, display):
         self.display = display

=== modified file 'openlp/migration/migratesongs.py'
--- openlp/migration/migratesongs.py	2009-09-21 23:11:50 +0000
+++ openlp/migration/migratesongs.py	2009-09-25 14:20:28 +0000
@@ -24,17 +24,15 @@
 
 import os
 import sys
-import logging
 import sqlite3
-from openlp.core.lib import PluginConfig
 
 from sqlalchemy import  *
-from sqlalchemy.sql import select
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, \
-    clear_mappers
-from openlp.plugins.songs.lib.models import metadata, session, \
-    engine, songs_table, Song, Author, Topic, Book
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
+    
+from openlp.core.lib import PluginConfig
+from openlp.plugins.songs.lib.models import metadata, songs_table, Song, \
+    Author, Topic, Book
 from openlp.plugins.songs.lib.tables import *
 from openlp.plugins.songs.lib.classes import *
 

=== modified file 'openlp/plugins/audit/lib/audittab.py'
--- openlp/plugins/audit/lib/audittab.py	2009-09-23 15:51:03 +0000
+++ openlp/plugins/audit/lib/audittab.py	2009-09-25 14:20:28 +0000
@@ -22,9 +22,9 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
+from openlp.core.lib import SettingsTab, translate, Receiver
 
 class AuditTab(SettingsTab):
     """

=== modified file 'openlp/plugins/audit/lib/manager.py'
--- openlp/plugins/audit/lib/manager.py	2009-09-23 17:36:22 +0000
+++ openlp/plugins/audit/lib/manager.py	2009-09-25 14:20:28 +0000
@@ -22,15 +22,10 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os, os.path
-import sys
-
-from sqlalchemy import asc, desc
-from openlp.plugins.audit.lib.models import init_models, metadata, session, \
-    engine, AuditItem, audit_table
-
 import logging
 
+from openlp.plugins.audit.lib.models import init_models, metadata, AuditItem
+
 class AuditManager():
     """
     The Song Manager provides a central location for all database code. This

=== modified file 'openlp/plugins/audit/lib/meta.py'
--- openlp/plugins/audit/lib/meta.py	2009-09-24 04:32:24 +0000
+++ openlp/plugins/audit/lib/meta.py	2009-09-25 14:20:28 +0000
@@ -24,7 +24,6 @@
 
 
 from sqlalchemy import MetaData
-from sqlalchemy.orm import scoped_session, sessionmaker
 
 __all__ = ['session', 'metadata', 'engine']
 

=== modified file 'openlp/plugins/audit/lib/models.py'
--- openlp/plugins/audit/lib/models.py	2009-09-23 15:51:03 +0000
+++ openlp/plugins/audit/lib/models.py	2009-09-25 14:20:28 +0000
@@ -23,9 +23,9 @@
 ###############################################################################
 
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
 
-from openlp.plugins.audit.lib.meta import session, metadata, engine
+from openlp.plugins.audit.lib.meta import metadata
 from openlp.plugins.audit.lib.tables import *
 from openlp.plugins.audit.lib.classes import *
 

=== modified file 'openlp/plugins/audit/lib/tables.py'
--- openlp/plugins/audit/lib/tables.py	2009-09-24 04:48:12 +0000
+++ openlp/plugins/audit/lib/tables.py	2009-09-25 14:20:28 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from sqlalchemy import Column, Table, ForeignKey, types
+from sqlalchemy import Column, Table, types
 
 from openlp.plugins.audit.lib.meta import metadata
 

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2009-09-25 14:20:28 +0000
@@ -22,11 +22,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import sys
+import logging
 import os, os.path
-import sys
-import time
-import logging
 
 from PyQt4 import QtCore, QtGui
 

=== modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py'
--- openlp/plugins/bibles/lib/bibleCSVimpl.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/bibles/lib/bibleCSVimpl.py	2009-09-25 14:20:28 +0000
@@ -25,11 +25,9 @@
 import logging
 import chardet
 
-from openlp.plugins.bibles.lib.bibleDBimpl import BibleDBImpl
 from openlp.plugins.bibles.lib.common import BibleCommon
 from openlp.core.lib import Receiver
 
-
 class BibleCSVImpl(BibleCommon):
     global log
     log=logging.getLogger(u'BibleCSVImpl')

=== modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py'
--- openlp/plugins/bibles/lib/bibleDBimpl.py	2009-09-21 23:11:50 +0000
+++ openlp/plugins/bibles/lib/bibleDBimpl.py	2009-09-25 14:20:28 +0000
@@ -26,7 +26,6 @@
 import logging
 
 from common import BibleCommon
-from openlp.core.utils import ConfigHelper
 from openlp.plugins.bibles.lib.models import *
 
 class BibleDBImpl(BibleCommon):

=== modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py'
--- openlp/plugins/bibles/lib/bibleHTTPimpl.py	2009-09-21 23:11:50 +0000
+++ openlp/plugins/bibles/lib/bibleHTTPimpl.py	2009-09-25 14:20:28 +0000
@@ -22,14 +22,10 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os, os.path
-import sys
-import urllib2
+import logging
 
 from common import BibleCommon, SearchResults
 
-import logging
-
 class BGExtract(BibleCommon):
     global log
     log=logging.getLogger(u'BibleHTTPMgr(BG_extract)')

=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
--- openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-09-21 23:11:50 +0000
+++ openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-09-25 14:20:28 +0000
@@ -30,7 +30,6 @@
 
 from PyQt4 import QtCore
 
-from openlp.plugins.bibles.lib.bibleDBimpl import BibleDBImpl
 from openlp.core.lib import Receiver
 
 class BibleOSISImpl():

=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/bibles/lib/biblestab.py	2009-09-25 14:20:28 +0000
@@ -24,7 +24,7 @@
 
 import logging
 
-from PyQt4 import Qt, QtCore, QtGui
+from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, str_to_bool, Receiver
 from openlp.core.lib import SettingsTab

=== modified file 'openlp/plugins/bibles/lib/common.py'
--- openlp/plugins/bibles/lib/common.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/bibles/lib/common.py	2009-09-25 14:20:28 +0000
@@ -22,9 +22,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os
-import os.path
-import sys
 import urllib2
 import chardet
 import logging

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2009-09-21 23:11:50 +0000
+++ openlp/plugins/bibles/lib/manager.py	2009-09-25 14:20:28 +0000
@@ -24,14 +24,11 @@
 
 import logging
 import os
-import sys
 
-from common import SearchResults
 from bibleOSISimpl import BibleOSISImpl
 from bibleCSVimpl import BibleCSVImpl
 from bibleDBimpl import BibleDBImpl
 from bibleHTTPimpl import BibleHTTPImpl
-from openlp.core.lib import Receiver
 
 class BibleMode(object):
     Full = 1

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2009-09-21 23:11:50 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2009-09-25 14:20:28 +0000
@@ -27,8 +27,8 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, ServiceItem, MediaManagerItem, \
-    Receiver, contextMenuAction, contextMenuSeparator, BaseListWithDnD
+from openlp.core.lib import translate, MediaManagerItem, Receiver, \
+    contextMenuAction, BaseListWithDnD
 from openlp.plugins.bibles.forms import BibleImportForm
 from openlp.plugins.bibles.lib.manager import BibleMode
 

=== modified file 'openlp/plugins/bibles/lib/models.py'
--- openlp/plugins/bibles/lib/models.py	2009-07-18 05:43:50 +0000
+++ openlp/plugins/bibles/lib/models.py	2009-09-25 14:20:28 +0000
@@ -19,7 +19,6 @@
 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
-import string
 
 from sqlalchemy import Column, Table, MetaData, ForeignKey, types, \
     create_engine

=== modified file 'openlp/plugins/bibles/test/test_bibleManager.py'
--- openlp/plugins/bibles/test/test_bibleManager.py	2009-09-03 15:19:30 +0000
+++ openlp/plugins/bibles/test/test_bibleManager.py	2009-09-25 14:20:28 +0000
@@ -16,36 +16,33 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import random
-import unittest
-
+import logging
 import os, os.path
 import sys
-mypath=os.path.split(os.path.abspath(__file__))[0]
+
+from openlp.plugins.bibles.lib.biblemanager import BibleManager
+
+mypath = os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
 
-from openlp.plugins.bibles.lib.biblemanager import BibleManager
-from openlp.utils import ConfigHelper
-
-import logging
 logging.basicConfig(level=logging.DEBUG,
                 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                 datefmt='%m-%d %H:%M',
                 filename='plugins.log',
                 filemode='w')
 
-console=logging.StreamHandler()
+console = logging.StreamHandler()
 # set a format which is simpler for console use
 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
 # tell the handler to use this format
 console.setFormatter(formatter)
 logging.getLogger(u'').addHandler(console)
-log=logging.getLogger(u'')
+log = logging.getLogger(u'')
 
 logging.info(u'\nLogging started')
 
 class TestBibleManager:
-    log=logging.getLogger(u'testBibleMgr')
+    log = logging.getLogger(u'testBibleMgr')
     def setup_class(self):
         log.debug(u'\n.......Register BM')
         self.bm = BibleManager()

=== modified file 'openlp/plugins/bibles/test/test_bibleManagerAPI.py'
--- openlp/plugins/bibles/test/test_bibleManagerAPI.py	2009-09-03 15:19:30 +0000
+++ openlp/plugins/bibles/test/test_bibleManagerAPI.py	2009-09-25 14:20:28 +0000
@@ -16,36 +16,33 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import random
-import unittest
-
+import logging
 import os, os.path
 import sys
-mypath=os.path.split(os.path.abspath(__file__))[0]
+
+from openlp.plugins.biblemanager.bibleManager import BibleManager
+
+mypath = os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
 
-from openlp.plugins.biblemanager.bibleManager import BibleManager
-from openlp.core.utils import ConfigHelper
-
-import logging
 logging.basicConfig(level=logging.DEBUG,
                 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                 datefmt='%m-%d %H:%M',
                 filename='plugins.log',
                 filemode='w')
 
-console=logging.StreamHandler()
+console = logging.StreamHandler()
 # set a format which is simpler for console use
 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
 # tell the handler to use this format
 console.setFormatter(formatter)
 logging.getLogger(u'').addHandler(console)
-log=logging.getLogger(u'')
+log = logging.getLogger(u'')
 
 logging.info(u'\nLogging started')
 
 class TestBibleManager:
-    log=logging.getLogger(u'testBibleMgr')
+    log = logging.getLogger(u'testBibleMgr')
     def setup_class(self):
         log.debug(u'\n.......Register BM')
         self.bm = BibleManager()

=== modified file 'openlp/plugins/bibles/test/test_bibleManagerCSV.py'
--- openlp/plugins/bibles/test/test_bibleManagerCSV.py	2009-09-03 15:19:30 +0000
+++ openlp/plugins/bibles/test/test_bibleManagerCSV.py	2009-09-25 14:20:28 +0000
@@ -16,36 +16,33 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import random
-import unittest
-
+import logging
 import os, os.path
 import sys
-mypath=os.path.split(os.path.abspath(__file__))[0]
+
+from openlp.plugins.bibles.lib.biblemanager import BibleManager
+
+mypath = os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
 
-from openlp.plugins.bibles.lib.biblemanager import BibleManager
-from openlp.utils import ConfigHelper
-
-import logging
 logging.basicConfig(level=logging.DEBUG,
                 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                 datefmt='%m-%d %H:%M',
                 filename='plugins.log',
                 filemode='w')
 
-console=logging.StreamHandler()
+console = logging.StreamHandler()
 # set a format which is simpler for console use
 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
 # tell the handler to use this format
 console.setFormatter(formatter)
 logging.getLogger(u'').addHandler(console)
-log=logging.getLogger(u'')
+log = logging.getLogger(u'')
 
 logging.info(u'\nLogging started')
 
 class TestBibleManager:
-    log=logging.getLogger(u'testBibleMgr')
+    log = logging.getLogger(u'testBibleMgr')
     def setup_class(self):
         log.debug(u'\n.......Register BM')
         self.bm = BibleManager()

=== modified file 'openlp/plugins/bibles/test/test_bibleManagerOSIS.py'
--- openlp/plugins/bibles/test/test_bibleManagerOSIS.py	2009-09-03 15:19:30 +0000
+++ openlp/plugins/bibles/test/test_bibleManagerOSIS.py	2009-09-25 14:20:29 +0000
@@ -16,36 +16,33 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import random
-import unittest
-
+import logging
 import os, os.path
 import sys
-mypath=os.path.split(os.path.abspath(__file__))[0]
+
+from openlp.plugins.bibles.lib.biblemanager import BibleManager
+
+mypath = os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
 
-from openlp.plugins.bibles.lib.biblemanager import BibleManager
-from openlp.utils import ConfigHelper
-
-import logging
 logging.basicConfig(level=logging.DEBUG,
                 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                 datefmt='%m-%d %H:%M',
                 filename='plugins.log',
                 filemode='w')
 
-console=logging.StreamHandler()
+console = logging.StreamHandler()
 # set a format which is simpler for console use
 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
 # tell the handler to use this format
 console.setFormatter(formatter)
 logging.getLogger(u'').addHandler(console)
-log=logging.getLogger(u'')
+log = logging.getLogger(u'')
 
 logging.info(u'\nLogging started')
 
 class TestBibleManager:
-    log=logging.getLogger(u'testBibleMgr')
+    log = logging.getLogger(u'testBibleMgr')
     def setup_class(self):
         log.debug(u'\n.......Register BM')
         self.bm = BibleManager()

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2009-09-12 18:27:17 +0000
+++ openlp/plugins/custom/customplugin.py	2009-09-25 14:20:29 +0000
@@ -24,7 +24,7 @@
 
 import logging
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
 from forms import EditCustomForm
 from openlp.core.lib import Plugin

=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py	2009-09-22 17:43:07 +0000
+++ openlp/plugins/custom/forms/editcustomform.py	2009-09-25 14:20:29 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import Qt, QtCore, QtGui
+from PyQt4 import QtCore, QtGui
 
 from editcustomdialog import Ui_customEditDialog
 from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate

=== modified file 'openlp/plugins/custom/lib/manager.py'
--- openlp/plugins/custom/lib/manager.py	2009-09-23 15:51:03 +0000
+++ openlp/plugins/custom/lib/manager.py	2009-09-25 14:20:29 +0000
@@ -22,15 +22,10 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os, os.path
-import sys
-
-from sqlalchemy import asc, desc
-from openlp.plugins.custom.lib.models import init_models, metadata, session, \
-    engine, CustomSlide, custom_slide_table
-
 import logging
 
+from openlp.plugins.custom.lib.models import init_models, metadata, CustomSlide
+
 class CustomManager():
     """
     The Song Manager provides a central location for all database code. This
@@ -38,7 +33,7 @@
     """
 
     global log
-    log=logging.getLogger(u'CustomManager')
+    log = logging.getLogger(u'CustomManager')
     log.info(u'Custom manager loaded')
 
     def __init__(self, config):

=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py	2009-09-22 17:43:07 +0000
+++ openlp/plugins/custom/lib/mediaitem.py	2009-09-25 14:20:29 +0000
@@ -26,8 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, SongXMLParser, ServiceItem, \
-    translate, contextMenuAction, contextMenuSeparator, BaseListWithDnD
+from openlp.core.lib import MediaManagerItem, SongXMLParser, BaseListWithDnD
 
 class CustomListView(BaseListWithDnD):
     def __init__(self, parent=None):

=== modified file 'openlp/plugins/custom/lib/meta.py'
--- openlp/plugins/custom/lib/meta.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/custom/lib/meta.py	2009-09-25 14:20:29 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from sqlalchemy import MetaData
-from sqlalchemy.orm import scoped_session, sessionmaker
 
 __all__ = ['session', 'metadata', 'engine']
 

=== modified file 'openlp/plugins/custom/lib/models.py'
--- openlp/plugins/custom/lib/models.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/custom/lib/models.py	2009-09-25 14:20:29 +0000
@@ -23,9 +23,9 @@
 ###############################################################################
 
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
 
-from openlp.plugins.custom.lib.meta import session, metadata, engine
+from openlp.plugins.custom.lib.meta import metadata
 from openlp.plugins.custom.lib.tables import *
 from openlp.plugins.custom.lib.classes import *
 

=== modified file 'openlp/plugins/custom/lib/tables.py'
--- openlp/plugins/custom/lib/tables.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/custom/lib/tables.py	2009-09-25 14:20:29 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from sqlalchemy import Column, Table, ForeignKey, types
+from sqlalchemy import Column, Table, types
 
 from openlp.plugins.custom.lib.meta import metadata
 

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2009-09-22 19:23:12 +0000
+++ openlp/plugins/images/imageplugin.py	2009-09-25 14:20:29 +0000
@@ -24,7 +24,7 @@
 
 import logging
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
 from openlp.core.lib import Plugin
 from openlp.plugins.images.lib import ImageMediaItem, ImageTab

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2009-09-22 19:36:25 +0000
+++ openlp/plugins/images/lib/imagetab.py	2009-09-25 14:20:29 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
+from openlp.core.lib import SettingsTab, translate, Receiver
 
 class ImageTab(SettingsTab):
     """

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2009-09-25 14:20:29 +0000
@@ -26,8 +26,7 @@
 import os
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
-    BaseListWithDnD, buildIcon
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
 
 # We have to explicitly create separate classes for each plugin
 # in order for DnD to the Service manager to work correctly.

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2009-09-22 19:23:12 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2009-09-25 14:20:29 +0000
@@ -24,14 +24,10 @@
 
 import logging
 import os
-import tempfile
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
-    BaseListWithDnD, buildIcon
-
-from openlp.plugins.media.lib import MediaTab, FileListData
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
 
 class MediaListView(BaseListWithDnD):
     def __init__(self, parent=None):

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2009-09-21 19:23:51 +0000
+++ openlp/plugins/media/mediaplugin.py	2009-09-25 14:20:29 +0000
@@ -22,11 +22,10 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
-from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab
-from openlp.plugins.media.lib import MediaTab,MediaMediaItem
+from openlp.core.lib import Plugin
+from openlp.plugins.media.lib import MediaTab, MediaMediaItem
 
 class MediaPlugin(Plugin):
 

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2009-09-21 23:11:50 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2009-09-25 14:20:29 +0000
@@ -27,16 +27,13 @@
 # http://nxsy.org/comparing-documents-with-openoffice-and-python
 
 import logging
-import os, subprocess
-import time
-import sys
+import os
 
 if os.name == u'nt':
     from win32com.client import Dispatch
 else:
     import uno
 
-
 from PyQt4 import QtCore
 
 class ImpressController(object):

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2009-09-25 14:20:29 +0000
@@ -26,8 +26,8 @@
 import os
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
-    BaseListWithDnD
+
+from openlp.core.lib import MediaManagerItem, translate, BaseListWithDnD
 from openlp.plugins.presentations.lib import MessageListener
 
 # We have to explicitly create separate classes for each plugin

=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py	2009-09-25 14:20:29 +0000
@@ -21,8 +21,8 @@
 import os
 
 from PyQt4 import QtCore
+
 from openlp.core.lib import Receiver
-from openlp.plugins.presentations.lib import ImpressController
 
 class MessageListener(object):
     """

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2009-09-24 07:35:30 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2009-09-25 14:20:29 +0000
@@ -23,15 +23,10 @@
 ###############################################################################
 
 import logging
-import os, subprocess
-import time
-import sys
-import win32api
+
 from ctypes import *
 from ctypes.wintypes import RECT
 
-from PyQt4 import QtCore
-
 class PptviewController(object):
     """
     Class to control interactions with PowerPOint Viewer Presentations

=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2009-09-21 19:26:10 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2009-09-25 14:20:29 +0000
@@ -22,9 +22,9 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import Qt, QtCore, QtGui
+from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab, translate, str_to_bool
+from openlp.core.lib import SettingsTab, translate
 
 class PresentationTab(SettingsTab):
     """

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2009-09-24 08:54:38 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2009-09-25 14:20:29 +0000
@@ -23,12 +23,11 @@
 ###############################################################################
 
 import os
-import sys
 import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, MediaManagerItem
+from openlp.core.lib import Plugin
 from openlp.plugins.presentations.lib import PresentationMediaItem, \
     PresentationTab, ImpressController
 if os.name == u'nt':
@@ -38,7 +37,6 @@
         pass
     from openlp.plugins.presentations.lib import PptviewController
 
-
 class PresentationPlugin(Plugin):
 
     global log

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2009-09-21 19:26:10 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2009-09-25 14:20:29 +0000
@@ -18,9 +18,9 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab, str_to_bool, translate
+from openlp.core.lib import SettingsTab, translate
 
 class RemoteTab(SettingsTab):
     """

=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/remotes/remoteplugin.py	2009-09-25 14:20:29 +0000
@@ -18,9 +18,8 @@
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
 import logging
-import sys
 
-from PyQt4 import QtNetwork, QtGui, QtCore
+from PyQt4 import QtNetwork, QtCore
 
 from openlp.core.lib import Plugin, Receiver
 from openlp.plugins.remotes.lib import RemoteTab

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2009-09-24 10:53:13 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2009-09-25 14:20:29 +0000
@@ -24,10 +24,9 @@
 
 import logging
 
-from PyQt4 import Qt, QtCore, QtGui
+from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, \
-    translate
+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
 from openlp.plugins.songs.forms import EditVerseForm
 from openlp.plugins.songs.lib.models import Song
 from editsongdialog import Ui_EditSongDialog

=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/forms/editverseform.py	2009-09-25 14:20:29 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import Qt, QtCore, QtGui
+from PyQt4 import QtCore, QtGui
 
 from editversedialog import Ui_EditVerseDialog
 

=== modified file 'openlp/plugins/songs/forms/songbookform.py'
--- openlp/plugins/songs/forms/songbookform.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/forms/songbookform.py	2009-09-25 14:20:29 +0000
@@ -22,7 +22,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
+
 from openlp.core.lib import translate
 from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
 

=== modified file 'openlp/plugins/songs/forms/topicsform.py'
--- openlp/plugins/songs/forms/topicsform.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/forms/topicsform.py	2009-09-25 14:20:29 +0000
@@ -22,7 +22,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
+
 from openlp.core.lib import translate
 from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
 

=== modified file 'openlp/plugins/songs/lib/manager.py'
--- openlp/plugins/songs/lib/manager.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/songs/lib/manager.py	2009-09-25 14:20:29 +0000
@@ -22,15 +22,11 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os, os.path
-import sys
-
-from sqlalchemy import asc, desc
-from openlp.plugins.songs.lib.models import init_models, metadata, session, \
-    engine, songs_table, Song, Author, Topic, Book
-
 import logging
 
+from openlp.plugins.songs.lib.models import init_models, metadata, Song, \
+    Author, Topic, Book
+
 class SongManager():
     """
     The Song Manager provides a central location for all database code. This

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2009-09-24 15:49:17 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2009-09-25 14:20:29 +0000
@@ -26,9 +26,8 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \
-    SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD, \
-    Receiver
+from openlp.core.lib import MediaManagerItem, translate, SongXMLParser, \
+    contextMenuAction, contextMenuSeparator, BaseListWithDnD, Receiver
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
 
 class SongListView(BaseListWithDnD):

=== modified file 'openlp/plugins/songs/lib/meta.py'
--- openlp/plugins/songs/lib/meta.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/lib/meta.py	2009-09-25 14:20:29 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from sqlalchemy import MetaData
-from sqlalchemy.orm import scoped_session, sessionmaker
 
 __all__ = ['session', 'metadata', 'engine']
 

=== modified file 'openlp/plugins/songs/lib/models.py'
--- openlp/plugins/songs/lib/models.py	2009-09-21 00:47:10 +0000
+++ openlp/plugins/songs/lib/models.py	2009-09-25 14:20:29 +0000
@@ -25,7 +25,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
 
-from openlp.plugins.songs.lib.meta import session, metadata, engine
+from openlp.plugins.songs.lib.meta import metadata
 from openlp.plugins.songs.lib.tables import *
 from openlp.plugins.songs.lib.classes import *
 

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/lib/songstab.py	2009-09-25 14:20:29 +0000
@@ -22,8 +22,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
-
 from openlp.core.lib import SettingsTab, translate
 
 class SongsTab(SettingsTab):

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/songs/songsplugin.py	2009-09-25 14:20:29 +0000
@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, translate
-from openlp.plugins.songs.lib import SongManager, SongsTab, SongMediaItem
+from openlp.plugins.songs.lib import SongManager, SongMediaItem
 from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
     OpenSongImportForm, OpenLPExportForm
 

=== modified file 'openlp/plugins/songs/test/test_song_verse.py'
--- openlp/plugins/songs/test/test_song_verse.py	2009-09-03 15:19:30 +0000
+++ openlp/plugins/songs/test/test_song_verse.py	2009-09-25 14:20:29 +0000
@@ -17,7 +17,7 @@
 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
-import py.test
+
 import os
 import sys
 

=== modified file 'openlpcnv.pyw'
--- openlpcnv.pyw	2009-09-21 17:56:36 +0000
+++ openlpcnv.pyw	2009-09-25 14:20:28 +0000
@@ -24,10 +24,8 @@
 ###############################################################################
 
 import os
-import sys
 import logging
 import time
-import datetime
 
 from openlp.migration.display import *
 from openlp.migration.migratefiles import *