- removed not needed imports

- fixed wrong list comprehensions
- other minor fixes

bzr-revno: 1768

openlp/plugins/bibles/lib/db.py

@@ -28,7 +28,6 @@
 import logging
 import chardet
 import os
-import re
 import sqlite3
 
 from PyQt4 import QtCore

openlp/plugins/bibles/lib/http.py

@@ -82,13 +82,16 @@ class BGExtract(object):
         Receiver.send_message(u'openlp_process_events')
         footnotes = soup.findAll(u'sup', u'footnote')
         if footnotes:
-            [footnote.extract() for footnote in footnotes]
+            for footnote in footnotes:
+                footnote.extract()
         crossrefs = soup.findAll(u'sup', u'xref')
         if crossrefs:
-            [crossref.extract() for crossref in crossrefs]
+            for crossref in crossrefs:
+                crossref.extract()
         headings = soup.findAll(u'h5')
         if headings:
-            [heading.extract() for heading in headings]
+            for heading in headings:
+                heading.extract()
         cleanup = [(re.compile('\s+'), lambda match: ' ')]
         verses = BeautifulSoup(str(soup), markupMassage=cleanup)
         verse_list = {}

openlp/plugins/images/lib/imagetab.py

@@ -28,7 +28,6 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, translate, Receiver
-from openlp.core.lib.ui import UiStrings, create_valign_combo
 
 class ImageTab(SettingsTab):
     """

openlp/plugins/presentations/lib/presentationcontroller.py

@@ -32,7 +32,7 @@ import shutil
 from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver, check_directory_exists, create_thumb, \
-    resize_image, validate_thumb
+    validate_thumb
 from openlp.core.utils import AppLocation
 
 log = logging.getLogger(__name__)

openlp/plugins/presentations/presentationplugin.py

@@ -87,7 +87,7 @@ class PresentationPlugin(Plugin):
         to close down their applications and release resources.
         """
         log.info(u'Plugin Finalise')
-        #Ask each controller to tidy up
+        # Ask each controller to tidy up.
         for key in self.controllers:
             controller = self.controllers[key]
             if controller.enabled():

openlp/plugins/songs/lib/cclifileimport.py

@@ -333,5 +333,6 @@ class CCLIFileImport(SongImport):
         if len(author_list) < 2:
             author_list = song_author.split(u'|')
         # Clean spaces before and after author names.
-        [self.addAuthor(author_name.strip()) for author_name in author_list]
+        for author_name in author_list:
+            self.addAuthor(author_name.strip())
         return self.finish()

openlp/plugins/songs/lib/mediaitem.py

@@ -397,7 +397,8 @@ class SongMediaItem(MediaManagerItem):
                     try:
                         os.remove(media_file.file_name)
                     except:
-                        log.exception('Could not remove file: %s', audio)
+                        log.exception('Could not remove file: %s',
+                            media_file.file_name)
                 try:
                     save_path = os.path.join(AppLocation.get_section_data_path(
                         self.plugin.name), 'audio', str(item_id))

openlp/plugins/songs/lib/openlyricsexport.py

@@ -30,7 +30,6 @@ songs from the database to the OpenLyrics format.
 """
 import logging
 import os
-import re
 
 from lxml import etree
 

openlp/plugins/songs/lib/upgrade.py

@@ -29,7 +29,7 @@ The :mod:`upgrade` module provides a way for the database and schema that is the
 backend for the Songs plugin
 """
 
-from sqlalchemy import Column, ForeignKey, Table, types
+from sqlalchemy import Column, Table, types
 from sqlalchemy.sql.expression import func
 from migrate import changeset
 from migrate.changeset.constraint import ForeignKeyConstraint

openlp/plugins/songusage/forms/songusagedeletedialog.py

@@ -28,7 +28,6 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.lib.ui import create_accept_reject_button_box
 
 class Ui_SongUsageDeleteDialog(object):
     def setupUi(self, songUsageDeleteDialog):