openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)


White spaces have been removed.
-- 
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/43915
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/cclifileimport.py'
--- openlp/plugins/songs/lib/cclifileimport.py	2010-12-08 20:17:51 +0000
+++ openlp/plugins/songs/lib/cclifileimport.py	2010-12-16 15:06:49 +0000
@@ -197,7 +197,7 @@
                     verse_text = verse_lines[1]
                 elif verse_lines[0].startswith(u'('):
                     verse_type = u'O'
-                    verse_text = verse_lines[1]            
+                    verse_text = verse_lines[1]
             if len(verse_text) > 0:
                 self.add_verse(verse_text, verse_type)
             check_first_verse_line = False
@@ -303,13 +303,13 @@
                                 verse_type = u'P'
                             elif line.startswith(u'(BRIDGE'):
                                 verse_type = u'B'
-                            # Handle all other misc types	
+                            # Handle all other misc types
                             elif line.startswith(u'('):
                                 verse_type = u'O'
                             else:
-                                verse_text = verse_text + line	
+                                verse_text = verse_text + line
                             check_first_verse_line = False
-                        else:																		
+                        else:
                             # We have verse content or the start of the
                             # last part. Add l so as to keep the CRLF
                             verse_text = verse_text + line

=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py	2010-12-13 14:24:16 +0000
+++ openlp/plugins/songs/lib/sofimport.py	2010-12-16 15:06:49 +0000
@@ -369,7 +369,7 @@
         if song_number == 50:
             return 8
         if song_number == 70:
-            return 4	
+            return 4
         if song_number == 75:
             return 8
         if song_number == 79:
@@ -529,7 +529,7 @@
         if song_number == 955:
             return 9
         if song_number == 968:
-            return 8		
+            return 8
         if song_number == 972:
             return 7
         if song_number == 974:

=== modified file 'openlp/plugins/songs/lib/test/test_opensongimport.py'
--- openlp/plugins/songs/lib/test/test_opensongimport.py	2010-09-19 08:47:00 +0000
+++ openlp/plugins/songs/lib/test/test_opensongimport.py	2010-12-16 15:06:49 +0000
@@ -56,11 +56,11 @@
     assert o.title == u'Martins Test'
     assert o.alternate_title == u''
     assert o.song_number == u'1'
-    assert [u'C1', u'Chorus 1'] in o.verses 
-    assert [u'C2', u'Chorus 2'] in o.verses 
-    assert not [u'C3', u'Chorus 3'] in o.verses 
-    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
-    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
+    assert [u'C1', u'Chorus 1'] in o.verses
+    assert [u'C2', u'Chorus 2'] in o.verses
+    assert not [u'C3', u'Chorus 3'] in o.verses
+    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses
+    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
     assert [u'V3A', u'V3 Line 1\nV3 Line 2'] in o.verses
     assert [u'RAP1', u'Rap 1 Line 1\nRap 1 Line 2'] in o.verses
@@ -80,11 +80,11 @@
     assert o.title == u'Martins Test'
     assert o.alternate_title == u''
     assert o.song_number == u'1'
-    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
-    assert [u'C1', u'Chorus 1'] in o.verses 
-    assert [u'C2', u'Chorus 2'] in o.verses 
-    assert not [u'C3', u'Chorus 3'] in o.verses 
-    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
+    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses
+    assert [u'C1', u'Chorus 1'] in o.verses
+    assert [u'C2', u'Chorus 2'] in o.verses
+    assert not [u'C3', u'Chorus 3'] in o.verses
+    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
     print o.verse_order_list
     assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
@@ -99,11 +99,11 @@
     assert o.alternate_title == u''
     assert o.song_number == u'2'
     print o.verses
-    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
-    assert [u'C1', u'Chorus 1'] in o.verses 
-    assert [u'C2', u'Chorus 2'] in o.verses 
-    assert not [u'C3', u'Chorus 3'] in o.verses 
-    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
+    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses
+    assert [u'C1', u'Chorus 1'] in o.verses
+    assert [u'C2', u'Chorus 2'] in o.verses
+    assert not [u'C3', u'Chorus 3'] in o.verses
+    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
     print o.verse_order_list
     assert o.verse_order_list == [u'V1', u'V2', u'B1', u'C1', u'C2']
@@ -120,7 +120,7 @@
     assert o.verse_order_list == [u'V1']
     assert o.topics == [u'Worship: Declaration']
     print o.verses[0]
-    assert [u'V1', u'Line 1\nLine 2'] in o.verses 
+    assert [u'V1', u'Line 1\nLine 2'] in o.verses
 
     print "Tests passed"