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

Revert PEP8 clean ups as they were already done in a different branch

This commit is contained in:
Jonathan Springer 2014-04-16 17:19:22 -04:00
parent 85fc53954d
commit ef5b1cf4ac
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/mainwindow.py
View File

@ -320,7 +320,7 @@ class Ui_MainWindow(object):
# i18n add Language Actions
add_actions(self.settings_language_menu, (self.auto_language_item, None))
add_actions(self.settings_language_menu, self.language_group.actions())
# Qt on OS X look for keywords in the menu items title to determine which menu items get added to the main menu.
# Qt on OS X look for keywords in the menu items title to determine which menu items get added to the main menu.
# If we are running on Mac OS X the menu items whose title contains those keywords but don't belong in the main
# menu need to be marked as such with QAction.NoRole.
if sys.platform == 'darwin':

2
openlp/plugins/songs/lib/songbeamerimport.py
View File

@ -137,7 +137,7 @@ class SongBeamerImport(SongImport):
if line.startswith('#') and not read_verses:
self.parseTags(line)
elif line.startswith('--'):
# --- and -- allowed for page-breaks (difference in Songbeamer only in printout)
# --- and -- allowed for page-breaks (difference in Songbeamer only in printout)
if self.current_verse:
self.replace_html_tags()
self.add_verse(self.current_verse, self.current_verse_type)

5
tests/functional/openlp_core_common/test_common.py
View File

@ -40,7 +40,6 @@ class TestCommonFunctions(TestCase):
"""
A test suite to test out various functions in the openlp.core.common module.
"""
def de_hump_conversion_test(self):
"""
Test the de_hump function with a class name
@ -80,5 +79,5 @@ class TestCommonFunctions(TestCase):
trace_error_handler(mocked_logger)
# THEN: The mocked_logger.error() method should have been called with the correct parameters
mocked_logger.error.assert_called_with(
'OpenLP Error trace\n File openlp.fake at line 56 \n\t called trace_error_handler_test')
mocked_logger.error.assert_called_with('OpenLP Error trace\n File openlp.fake at line 56 \n\t called trace_error_handler_test')

2
tests/functional/openlp_core_lib/test_image_manager.py
View File

@ -171,4 +171,4 @@ class TestImageManager(TestCase, TestMixin):
self.lock.release()
# The sleep time is adjusted in the test case.
time.sleep(self.sleep_time)
return ''
return ''

2
tests/functional/openlp_core_lib/test_ui.py
View File

@ -162,7 +162,7 @@ class TestUi(TestCase):
# WHEN: We create an action with some properties
action = create_action(dialog, 'my_action', text='my text', icon=':/wizards/wizard_firsttime.bmp',
tooltip='my tooltip', statustip='my statustip')
tooltip='my tooltip', statustip='my statustip')
# THEN: These properties should be set
self.assertIsInstance(action, QtGui.QAction)

2
tests/functional/openlp_core_ui/test_maindisplay.py
View File

@ -106,4 +106,4 @@ class TestMainDisplay(TestCase):
self.assertEqual('QGraphicsView {}', main_display.styleSheet(),
'MainDisplay instance should not be transparent')
self.assertFalse(main_display.testAttribute(QtCore.Qt.WA_TranslucentBackground),
'MainDisplay hasnt translucent background')
'MainDisplay hasnt translucent background')

10
tests/functional/openlp_plugins/songs/test_ewimport.py
View File

@ -141,7 +141,7 @@ class TestEasyWorshipSongImport(TestCase):
self.assertIsNotNone(field_desc_entry, 'Import should not be none')
self.assertEqual(field_desc_entry.name, name, 'FieldDescEntry.name should be the same as the name argument')
self.assertEqual(field_desc_entry.field_type, field_type,
'FieldDescEntry.type should be the same as the type argument')
'FieldDescEntry.type should be the same as the type argument')
self.assertEqual(field_desc_entry.size, size, 'FieldDescEntry.size should be the same as the size argument')
def create_importer_test(self):
@ -231,8 +231,8 @@ class TestEasyWorshipSongImport(TestCase):
# THEN: get_field should return the known results
self.assertEqual(return_value, result,
'get_field should return "%s" when called with "%s"' %
(result, TEST_FIELDS[field_index]))
'get_field should return "%s" when called with "%s"' %
(result, TEST_FIELDS[field_index]))
def get_memo_field_test(self):
"""
@ -404,10 +404,10 @@ class TestEasyWorshipSongImport(TestCase):
self.assertEqual(importer.copyright, song_copyright)
if ccli_number:
self.assertEqual(importer.ccli_number, ccli_number, 'ccli_number for %s should be %s'
% (title, ccli_number))
% (title, ccli_number))
for verse_text, verse_tag in add_verse_calls:
mocked_add_verse.assert_any_call(verse_text, verse_tag)
if verse_order_list:
self.assertEqual(importer.verse_order_list, verse_order_list,
'verse_order_list for %s should be %s' % (title, verse_order_list))
'verse_order_list for %s should be %s' % (title, verse_order_list))
mocked_finish.assert_called_with()

1
tests/functional/openlp_plugins/songs/test_lib.py
View File

@ -129,6 +129,7 @@ class TestLib(TestCase):
# THEN: The result should be a tuple of songs..
assert result == (self.song1, self.song2), 'The result should be the tuble of songs'
def songs_probably_equal_different_song_test(self):
"""
Test the songs_probably_equal function with two different songs.

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

@ -91,7 +91,7 @@ class TestSongBeamerImport(TestCase):
# THEN: do_import should return none and the progress bar maximum should not be set.
self.assertIsNone(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')
'setMaxium on import_wizard.progress_bar should not have been called')
def valid_import_source_test(self):
"""
@ -149,10 +149,10 @@ class TestSongBeamerImport(TestCase):
mocked_add_verse.assert_any_call(verse_text, verse_tag)
if song_book_name:
self.assertEqual(importer.song_book_name, song_book_name, 'song_book_name for %s should be "%s"' %
(song_file, song_book_name))
(song_file, song_book_name))
if song_number:
self.assertEqual(importer.song_number, song_number, 'song_number for %s should be %s' %
(song_file, song_number))
(song_file, song_number))
mocked_finish.assert_called_with()
def check_verse_marks_test(self):

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

@ -96,7 +96,7 @@ class TestSongShowPlusImport(TestCase):
# THEN: do_import should return none and the progress bar maximum should not be set.
self.assertIsNone(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,
'setMaximum 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):
"""
@ -144,8 +144,8 @@ class TestSongShowPlusImport(TestCase):
# THEN: The returned value should should correlate with the input arguments
for original_tag, openlp_tag in test_values:
self.assertEqual(importer.to_openlp_verse_tag(original_tag), openlp_tag,
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
(openlp_tag, original_tag))
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
(openlp_tag, original_tag))
def to_openlp_verse_tag_verse_order_test(self):
"""
@ -173,5 +173,5 @@ class TestSongShowPlusImport(TestCase):
# THEN: The returned value should should correlate with the input arguments
for original_tag, openlp_tag in test_values:
self.assertEqual(importer.to_openlp_verse_tag(original_tag, ignore_unique=True), openlp_tag,
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
(openlp_tag, original_tag))
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
(openlp_tag, original_tag))

10
tests/helpers/songfileimport.py
View File

@ -117,23 +117,23 @@ class SongImportTestHelper(TestCase):
self.mocked_add_copyright.assert_called_with(song_copyright)
if ccli_number:
self.assertEqual(importer.ccli_number, ccli_number, 'ccli_number for %s should be %s' %
(source_file_name, ccli_number))
(source_file_name, ccli_number))
for verse_text, verse_tag in add_verse_calls:
self.mocked_add_verse.assert_any_call(verse_text, verse_tag)
if topics:
self.assertEqual(importer.topics, topics, 'topics for %s should be %s' % (source_file_name, topics))
if comments:
self.assertEqual(importer.comments, comments, 'comments for %s should be "%s"' %
(source_file_name, comments))
(source_file_name, comments))
if song_book_name:
self.assertEqual(importer.song_book_name, song_book_name, 'song_book_name for %s should be "%s"' %
(source_file_name, song_book_name))
(source_file_name, song_book_name))
if song_number:
self.assertEqual(importer.song_number, song_number, 'song_number for %s should be %s' %
(source_file_name, song_number))
(source_file_name, song_number))
if verse_order_list:
self.assertEqual(importer.verse_order_list, [], 'verse_order_list for %s should be %s' %
(source_file_name, verse_order_list))
(source_file_name, verse_order_list))
self.mocked_finish.assert_called_with()
def _get_data(self, data, key):

2
tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py
View File

@ -104,4 +104,4 @@ class TestBibleManager(TestCase, TestMixin):
results = parse_reference('1 Timothy 1:1-2:1', self.manager.db_cache['tests'], MagicMock(), 54)
# THEN a verse array should be returned
self.assertEqual([(54, 1, 1, -1), (54, 2, 1, 1)], results, "The bible verses should matches the expected "
"results")
"results")