openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/not-used-imports into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/not-used-imports/+merge/143968

- removed not needed imports
-- 
https://code.launchpad.net/~googol/openlp/not-used-imports/+merge/143968
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/not-used-imports into lp:openlp.

=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py	2012-12-29 20:56:56 +0000
+++ openlp/core/lib/db.py	2013-01-18 23:37:23 +0000
@@ -34,7 +34,6 @@
 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

=== modified file 'openlp/core/lib/formattingtags.py'
--- openlp/core/lib/formattingtags.py	2012-12-29 20:56:56 +0000
+++ openlp/core/lib/formattingtags.py	2013-01-18 23:37:23 +0000
@@ -31,8 +31,6 @@
 """
 import cPickle
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import translate, Settings
 
 class FormattingTags(object):

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2013-01-15 21:29:56 +0000
+++ openlp/core/lib/serviceitem.py	2013-01-18 23:37:23 +0000
@@ -37,7 +37,7 @@
 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
 

=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py	2012-12-29 20:56:56 +0000
+++ openlp/core/ui/__init__.py	2013-01-18 23:37:23 +0000
@@ -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):
     """

=== modified file 'openlp/core/ui/exceptiondialog.py'
--- openlp/core/ui/exceptiondialog.py	2012-12-29 20:56:56 +0000
+++ openlp/core/ui/exceptiondialog.py	2013-01-18 23:37:23 +0000
@@ -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):

=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2012-12-29 20:56:56 +0000
+++ openlp/core/ui/settingsform.py	2013-01-18 23:37:23 +0000
@@ -31,7 +31,7 @@
 """
 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 @@
         """
         if self.resetSuffixes:
             self.mainWindow.serviceManagerContents.resetSupportedSuffixes()
-            self.resetSuffixes = False
\ No newline at end of file
+            self.resetSuffixes = False

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2013-01-01 16:33:41 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2013-01-18 23:37:23 +0000
@@ -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

=== modified file 'openlp/plugins/bibles/lib/__init__.py'
--- openlp/plugins/bibles/lib/__init__.py	2013-01-01 16:33:41 +0000
+++ openlp/plugins/bibles/lib/__init__.py	2013-01-18 23:37:23 +0000
@@ -34,7 +34,7 @@
 import re
 
 from openlp.core.lib import translate, Settings
-from openlp.plugins.bibles.lib.db import BiblesResourcesDB
+
 
 log = logging.getLogger(__name__)
 

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2013-01-01 16:33:41 +0000
+++ openlp/plugins/bibles/lib/manager.py	2013-01-18 23:37:23 +0000
@@ -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

=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py	2013-01-05 22:17:30 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py	2013-01-18 23:37:23 +0000
@@ -28,7 +28,6 @@
 ###############################################################################
 
 import logging
-import os
 
 from PyQt4 import QtCore
 

=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py	2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/__init__.py	2013-01-18 23:37:23 +0000
@@ -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

=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py	2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/db.py	2013-01-18 23:37:23 +0000
@@ -36,7 +36,6 @@
 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
 

=== modified file 'openlp/plugins/songs/lib/dreambeamimport.py'
--- openlp/plugins/songs/lib/dreambeamimport.py	2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/dreambeamimport.py	2013-01-18 23:37:23 +0000
@@ -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 @@
     """
     The :class:`DreamBeamImport` class provides the ability to import song files from
     DreamBeam.
-    
+
     An example of DreamBeam xml mark-up::
-    
+
         <?xml version="1.0"?>
-        <DreamSong xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
+        <DreamSong xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
             xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
           <WordWrap>false</WordWrap>
           <Version>0.80</Version>
@@ -84,7 +82,7 @@
 
         * \*.xml
     """
-    
+
     def doImport(self):
         """
         Receive a single file or a list of files to import.

=== modified file 'openlp/plugins/songs/lib/mediashoutimport.py'
--- openlp/plugins/songs/lib/mediashoutimport.py	2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/mediashoutimport.py	2013-01-18 23:37:23 +0000
@@ -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

=== modified file 'openlp/plugins/songs/lib/songproimport.py'
--- openlp/plugins/songs/lib/songproimport.py	2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/songproimport.py	2013-01-18 23:37:23 +0000
@@ -31,9 +31,7 @@
 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