openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/trivial into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/trivial/+merge/78000

Hello,

- removed not needed imports
- fixed wrong list comprehensions
- other minor fixes
-- 
https://code.launchpad.net/~googol/openlp/trivial/+merge/78000
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/trivial into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2011-08-12 14:54:16 +0000
+++ openlp/plugins/bibles/lib/db.py	2011-10-03 20:32:30 +0000
@@ -28,7 +28,6 @@
 import logging
 import chardet
 import os
-import re
 import sqlite3
 
 from PyQt4 import QtCore

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2011-08-15 09:54:07 +0000
+++ openlp/plugins/bibles/lib/http.py	2011-10-03 20:32:30 +0000
@@ -82,13 +82,16 @@
         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 = {}

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2011-08-26 08:21:27 +0000
+++ openlp/plugins/images/lib/imagetab.py	2011-10-03 20:32:30 +0000
@@ -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):
     """

=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py	2011-06-25 13:47:46 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py	2011-10-03 20:32:30 +0000
@@ -32,7 +32,7 @@
 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__)

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2011-07-23 21:29:24 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2011-10-03 20:32:30 +0000
@@ -87,7 +87,7 @@
         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():

=== modified file 'openlp/plugins/songs/lib/cclifileimport.py'
--- openlp/plugins/songs/lib/cclifileimport.py	2011-09-06 05:47:33 +0000
+++ openlp/plugins/songs/lib/cclifileimport.py	2011-10-03 20:32:30 +0000
@@ -333,5 +333,6 @@
         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()

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2011-09-25 06:37:40 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2011-10-03 20:32:30 +0000
@@ -397,7 +397,8 @@
                     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))

=== modified file 'openlp/plugins/songs/lib/openlyricsexport.py'
--- openlp/plugins/songs/lib/openlyricsexport.py	2011-08-12 15:31:16 +0000
+++ openlp/plugins/songs/lib/openlyricsexport.py	2011-10-03 20:32:30 +0000
@@ -30,7 +30,6 @@
 """
 import logging
 import os
-import re
 
 from lxml import etree
 

=== modified file 'openlp/plugins/songs/lib/upgrade.py'
--- openlp/plugins/songs/lib/upgrade.py	2011-08-27 18:43:05 +0000
+++ openlp/plugins/songs/lib/upgrade.py	2011-10-03 20:32:30 +0000
@@ -29,7 +29,7 @@
 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

=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
--- openlp/plugins/songusage/forms/songusagedeletedialog.py	2011-08-16 19:53:52 +0000
+++ openlp/plugins/songusage/forms/songusagedeletedialog.py	2011-10-03 20:32:30 +0000
@@ -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):