From 91bb04f03a2e28e93689a2f1ba1f0538c2172c03 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Tue, 17 Sep 2013 21:31:19 +0100 Subject: [PATCH] Changed to using super() --- tests/functional/openlp_plugins/songs/songfileimporthelper.py | 2 +- .../functional/openlp_plugins/songs/test_songshowplusimport.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/openlp_plugins/songs/songfileimporthelper.py b/tests/functional/openlp_plugins/songs/songfileimporthelper.py index 5ea907651..e8bbc46bf 100644 --- a/tests/functional/openlp_plugins/songs/songfileimporthelper.py +++ b/tests/functional/openlp_plugins/songs/songfileimporthelper.py @@ -11,10 +11,10 @@ class SongImportTestHelper(TestCase): This class is designed to be a helper class to reduce repition when testing the import of song files. """ def __init__(self, *args, **kwargs): + super(SongImportTestHelper, self).__init__(*args, **kwargs) self.importer_module = __import__( 'openlp.plugins.songs.lib.%s' % self.importer_module_name, fromlist=[self.importer_class_name]) self.importer_class = getattr(self.importer_module, self.importer_class_name) - TestCase.__init__(self, *args, **kwargs) def setUp(self): """ diff --git a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py index 7f252018b..28ff53249 100644 --- a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py +++ b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py @@ -17,7 +17,7 @@ class TestSongShowPlusFileImport(SongImportTestHelper): def __init__(self, *args, **kwargs): self.importer_class_name = 'SongShowPlusImport' self.importer_module_name = 'songshowplusimport' - SongImportTestHelper.__init__(self, *args, **kwargs) + super(TestSongShowPlusFileImport, self).__init__(*args, **kwargs) def test_song_import(self): test_import = self.file_import(os.path.join(TEST_PATH, 'Amazing Grace.sbsong'),