raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pep8 fixes

This commit is contained in:
Tomas Groth 2016-08-19 17:05:44 +02:00
parent c463c46cf6
commit 825a703cd0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/importers/songbeamer.py
View File

@ -215,7 +215,7 @@ class SongBeamerImport(SongImport):
elif tag_val[0] == '#AddCopyrightInfo':
pass
elif tag_val[0] == '#AudioFile':
parse_audio_file(tag_val[1])
self.parse_audio_file(tag_val[1])
elif tag_val[0] == '#Author':
self.parse_author(tag_val[1])
elif tag_val[0] == '#BackgroundImage':

6
tests/functional/openlp_plugins/songs/test_songbeamerimport.py
View File

@ -105,7 +105,8 @@ class TestSongBeamerImport(TestCase):
self.importer.import_source = source
# THEN: do_import should return none and the progress bar maximum should not be set.
self.assertIsNone(self.importer.do_import(), 'do_import should return None when import_source is not a list')
self.assertIsNone(self.importer.do_import(),
'do_import should return None when import_source is not a list')
self.assertEqual(mocked_import_wizard.progress_bar.setMaximum.called, False,
'setMaxium on import_wizard.progress_bar should not have been called')
@ -175,7 +176,8 @@ class TestSongBeamerImport(TestCase):
result = self.importer.check_verse_marks(line)
# THEN: we should get back false and none as self.importer.current_verse_type
self.assertFalse(result, 'No versemark for <Jesus my saviour> should be found, value false')
self.assertIsNone(self.importer.current_verse_type, '<Jesus my saviour> should be interpreted as none versemark')
self.assertIsNone(self.importer.current_verse_type,
'<Jesus my saviour> should be interpreted as none versemark')
# GIVEN: line with song-text with 2 words
line = 'Praise him'