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

minor fixes

Browse Source
This commit is contained in:
Tim Bentley 2013-04-23 20:17:25 +01:00
parent 11112e7712
commit 0ef65fb8d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/forms/__init__.py
View File

@ -52,4 +52,4 @@ This allows OpenLP to use ``self.object`` for all the GUI elements while keeping
them separate from the functionality, so that it is easier to recreate the GUI them separate from the functionality, so that it is easier to recreate the GUI
from the .ui files later if necessary. from the .ui files later if necessary.
""" """
from editsongform import EditSongForm from editsongform import EditSongForm

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

@ -26,7 +26,7 @@ class TestMediaItem(TestCase):
Registry().register(u'service_list', MagicMock()) Registry().register(u'service_list', MagicMock())
with patch('openlp.core.lib.mediamanageritem.MediaManagerItem.__init__'), \ with patch('openlp.core.lib.mediamanageritem.MediaManagerItem.__init__'), \
patch('openlp.plugins.songs.forms.editsongform.EditSongForm.__init__') : patch('openlp.plugins.songs.forms.editsongform.EditSongForm.__init__'):
self.media_item = SongMediaItem(MagicMock(), MagicMock()) self.media_item = SongMediaItem(MagicMock(), MagicMock())
fd, self.ini_file = mkstemp(u'.ini') fd, self.ini_file = mkstemp(u'.ini')
@ -42,7 +42,7 @@ class TestMediaItem(TestCase):
try: try:
os.unlink(self.ini_file) os.unlink(self.ini_file)
os.unlink(Settings().fileName()) os.unlink(Settings().fileName())
except: except Exception:
pass pass
def build_song_footer_one_author_test(self): def build_song_footer_one_author_test(self):
@ -122,4 +122,4 @@ class TestMediaItem(TestCase):
# THEN: I would get an amended footer string # THEN: I would get an amended footer string
self.assertEqual(service_item.raw_footer, [u'My Song', u'my author', u'My copyright', u'CCLI License: 4321'], self.assertEqual(service_item.raw_footer, [u'My Song', u'my author', u'My copyright', u'CCLI License: 4321'],
u'The array should be returned correctly with a song, an author, copyright and amended ccli') u'The array should be returned correctly with a song, an author, copyright and amended ccli')