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

PEP8 fixes

Browse Source
This commit is contained in:
Tomas Groth 2014-04-05 09:22:24 +02:00
parent 648e0b2290
commit 7dc1b8b759
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,7 @@ class EasyWorshipSongImport(SongImport):
# Load song content # Load song content
# Offset Field Data type Length Details # Offset Field Data type Length Details
# ------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------
# 0 Length int32le 4 Length (L) of the content, including the compressed content # 0 Length int32le 4 Length (L) of content, including the compressed content
# and the following fields (14 bytes total). # and the following fields (14 bytes total).
# 4 Content string L-14 Content compressed with deflate. # 4 Content string L-14 Content compressed with deflate.
# Checksum int32be 4 Alder-32 checksum. # Checksum int32be 4 Alder-32 checksum.

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

@ -70,9 +70,9 @@ SONG_TEST_DATA = [
'verse_order_list': []}] 'verse_order_list': []}]
EWS_SONG_TEST_DATA =\ EWS_SONG_TEST_DATA =\
{ 'title' : 'Vi pløjed og vi så\'de', {'title': 'Vi pløjed og vi så\'de',
'authors' : ['Matthias Claudius'], 'authors': ['Matthias Claudius'],
'verses' : 'verses':
[('Vi pløjed og vi så\'de\nvor sæd i sorten jord,\nså bad vi ham os hjælpe,\nsom højt i Himlen bor,\n' [('Vi pløjed og vi så\'de\nvor sæd i sorten jord,\nså bad vi ham os hjælpe,\nsom højt i Himlen bor,\n'
'og han lod snefald hegne\nmod frosten barsk og hård,\nhan lod det tø og regne\nog varme mildt i vår.', 'og han lod snefald hegne\nmod frosten barsk og hård,\nhan lod det tø og regne\nog varme mildt i vår.',
'v1'), 'v1'),
@ -81,8 +81,7 @@ EWS_SONG_TEST_DATA =\
'ham lyder vind og vove,\nham rører ravnes nød,\nhvi skulle ej hans småbørn\nda og få dagligt brød?', 'v2'), 'ham lyder vind og vove,\nham rører ravnes nød,\nhvi skulle ej hans småbørn\nda og få dagligt brød?', 'v2'),
('Ja, tak, du kære Fader,\nså mild, så rig, så rund,\nfor korn i hæs og lader,\nfor godt i allen stund!\n' ('Ja, tak, du kære Fader,\nså mild, så rig, så rund,\nfor korn i hæs og lader,\nfor godt i allen stund!\n'
'Vi kan jo intet give,\nsom nogen ting er værd,\nmen tag vort stakkels hjerte,\nså ringe som det er!', 'Vi kan jo intet give,\nsom nogen ting er værd,\nmen tag vort stakkels hjerte,\nså ringe som det er!',
'v3')], 'v3')]}
}
class EasyWorshipSongImportLogger(EasyWorshipSongImport): class EasyWorshipSongImportLogger(EasyWorshipSongImport):
@ -435,7 +434,8 @@ class TestEasyWorshipSongImport(TestCase):
# GIVEN: Test files with a mocked out SongImport class, a mocked out "manager", a mocked out "import_wizard", # GIVEN: Test files with a mocked out SongImport class, a mocked out "manager", a mocked out "import_wizard",
# and mocked out "author", "add_copyright", "add_verse", "finish" methods. # and mocked out "author", "add_copyright", "add_verse", "finish" methods.
with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \ with patch('openlp.plugins.songs.lib.ewimport.SongImport'), \
patch('openlp.plugins.songs.lib.ewimport.retrieve_windows_encoding') as mocked_retrieve_windows_encoding: patch('openlp.plugins.songs.lib.ewimport.retrieve_windows_encoding') \
as mocked_retrieve_windows_encoding:
mocked_retrieve_windows_encoding.return_value = 'cp1252' mocked_retrieve_windows_encoding.return_value = 'cp1252'
mocked_manager = MagicMock() mocked_manager = MagicMock()
mocked_import_wizard = MagicMock() mocked_import_wizard = MagicMock()