diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py index 3b6019e5f..88b9a8569 100644 --- a/openlp/plugins/songs/lib/cclifileimport.py +++ b/openlp/plugins/songs/lib/cclifileimport.py @@ -197,7 +197,7 @@ class CCLIFileImport(SongImport): 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 @@ class CCLIFileImport(SongImport): 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 diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py index b9cd428c0..320e5c88a 100644 --- a/openlp/plugins/songs/lib/sofimport.py +++ b/openlp/plugins/songs/lib/sofimport.py @@ -369,7 +369,7 @@ class SofImport(OooImport): 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 @@ class SofImport(OooImport): if song_number == 955: return 9 if song_number == 968: - return 8 + return 8 if song_number == 972: return 7 if song_number == 974: diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py index b503c65c5..27c7cca48 100644 --- a/openlp/plugins/songs/lib/test/test_opensongimport.py +++ b/openlp/plugins/songs/lib/test/test_opensongimport.py @@ -56,11 +56,11 @@ def test(): 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 @@ def test(): 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 @@ def test(): 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 @@ def test(): 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"