openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)


Cleanups
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/28531
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py	2010-06-24 18:35:01 +0000
+++ openlp/plugins/bibles/lib/osis.py	2010-06-25 19:00:48 +0000
@@ -68,7 +68,8 @@
         self.q1_regex = re.compile(r'<q(.*?)level="1"(.*?)>')
         self.q2_regex = re.compile(r'<q(.*?)level="2"(.*?)>')
         self.trans_regex = re.compile(r'<transChange(.*?)>(.*?)</transChange>')
-        self.divineName_regex = re.compile(r'<divineName(.*?)>(.*?)</divineName>')
+        self.divineName_regex = re.compile(
+            r'<divineName(.*?)>(.*?)</divineName>')
         self.spaces_regex = re.compile(r'([ ]{2,})')
         self.books = {}
         filepath = os.path.join(

=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py	2010-06-25 08:07:51 +0000
+++ openlp/plugins/songs/lib/songimport.py	2010-06-25 19:00:48 +0000
@@ -25,8 +25,6 @@
 
 import re
 
-from PyQt4 import QtGui
-
 from openlp.core.lib import SongXMLBuilder, translate
 from openlp.plugins.songs.lib import VerseType
 from openlp.plugins.songs.lib.models import Song, Author, Topic, Book