From dc9d3cd74eb2dfd0fd35e2d4488912d144fce931 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sat, 7 Sep 2013 16:55:09 +0000 Subject: [PATCH] changed test_songshowplusimport.py to py3 --- .../songs/test_songshowplusimport.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py index 4dfe03645..5b5062823 100644 --- a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py +++ b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py @@ -11,19 +11,19 @@ from openlp.plugins.songs.lib import VerseType from openlp.plugins.songs.lib.songshowplusimport import SongShowPlusImport TEST_PATH = os.path.abspath( - os.path.join(os.path.dirname(__file__), u'..', u'..', u'..', u'resources', u'songshowplussongs')) + os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'songshowplussongs')) class TestSongShowPlusFileImport(SongImportTestHelper): def __init__(self, *args, **kwargs): - self.importer_class_name = u'SongShowPlusImport' - self.importer_module_name = u'songshowplusimport' + self.importer_class_name = 'SongShowPlusImport' + self.importer_module_name = 'songshowplusimport' SongImportTestHelper.__init__(self, *args, **kwargs) def test_song_import(self): - test_import = self.file_import(os.path.join(TEST_PATH, u'Amazing Grace.sbsong'), - self.load_external_result_data(os.path.join(TEST_PATH, u'Amazing Grace.json'))) - test_import = self.file_import(os.path.join(TEST_PATH, u'Beautiful Garden Of Prayer.sbsong'), - self.load_external_result_data(os.path.join(TEST_PATH, u'Beautiful Garden Of Prayer.json'))) + test_import = self.file_import(os.path.join(TEST_PATH, 'Amazing Grace.sbsong'), + self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json'))) + test_import = self.file_import(os.path.join(TEST_PATH, 'Beautiful Garden Of Prayer.sbsong'), + self.load_external_result_data(os.path.join(TEST_PATH, 'Beautiful Garden Of Prayer.json'))) class TestSongShowPlusImport(TestCase):