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

Fix for py3

Browse Source
This commit is contained in:
Philip Ridout 2013-09-14 22:43:46 +01:00
parent 78e5ad4af7
commit ca3e32c294
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/functional/openlp_plugins/songs/songfileimporthelper.py
View File

@ -53,7 +53,7 @@ class SongImportTestHelper(TestCase):
A method to load and return an object containing the song data from an external file. A method to load and return an object containing the song data from an external file.
""" """
result_file = open(file_name, 'rb') result_file = open(file_name, 'rb')
return json.loads(result_file.read()) return json.loads(result_file.read().decode())
def file_import(self, source_file_name, result_data): def file_import(self, source_file_name, result_data):
""" """

2
tests/functional/openlp_plugins/songs/test_songshowplusimport.py
View File

@ -63,7 +63,7 @@ class TestSongShowPlusImport(TestCase):
# THEN: doImport should return none and the progress bar maximum should not be set. # THEN: doImport should return none and the progress bar maximum should not be set.
self.assertIsNone(importer.doImport(), 'doImport should return None when import_source is not a list') self.assertIsNone(importer.doImport(), 'doImport should return None when import_source is not a list')
self.assertEquals(mocked_import_wizard.progress_bar.setMaximum.called, False, self.assertEquals(mocked_import_wizard.progress_bar.setMaximum.called, False,
'setMaxium on import_wizard.progress_bar should not have been called') 'setMaximum on import_wizard.progress_bar should not have been called')
def valid_import_source_test(self): def valid_import_source_test(self):
""" """