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

PEP8

Browse Source
This commit is contained in:
Samuel Mehrbrodt 2014-04-21 12:06:17 +02:00
parent 70a5795cd2
commit cc0af8845e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/plugins/songs/lib/upgrade.py
View File

@ -112,7 +112,8 @@ def upgrade_4(session, metadata):
op.create_table('authors_songs_tmp', op.create_table('authors_songs_tmp',
Column('author_id', types.Integer(), ForeignKey('authors.id'), primary_key=True), Column('author_id', types.Integer(), ForeignKey('authors.id'), primary_key=True),
Column('song_id', types.Integer(), ForeignKey('songs.id'), primary_key=True), Column('song_id', types.Integer(), ForeignKey('songs.id'), primary_key=True),
Column('author_type', types.String(), primary_key=True, nullable=False, server_default=text('""'))) Column('author_type', types.String(), primary_key=True,
nullable=False, server_default=text('""')))
op.execute('INSERT INTO authors_songs_tmp SELECT author_id, song_id, "" FROM authors_songs') op.execute('INSERT INTO authors_songs_tmp SELECT author_id, song_id, "" FROM authors_songs')
op.drop_table('authors_songs') op.drop_table('authors_songs')
op.rename_table('authors_songs_tmp', 'authors_songs') op.rename_table('authors_songs_tmp', 'authors_songs')

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

@ -76,19 +76,19 @@ class TestMediaItem(TestCase, TestMixin):
mock_author.display_name = 'my author' mock_author.display_name = 'my author'
mock_author_song = MagicMock() mock_author_song = MagicMock()
mock_author_song.author = mock_author mock_author_song.author = mock_author
mock_author_song.author_type=AuthorType.Music mock_author_song.author_type = AuthorType.Music
mock_song.authors_songs.append(mock_author_song) mock_song.authors_songs.append(mock_author_song)
mock_author = MagicMock() mock_author = MagicMock()
mock_author.display_name = 'another author' mock_author.display_name = 'another author'
mock_author_song = MagicMock() mock_author_song = MagicMock()
mock_author_song.author = mock_author mock_author_song.author = mock_author
mock_author_song.author_type=AuthorType.Words mock_author_song.author_type = AuthorType.Words
mock_song.authors_songs.append(mock_author_song) mock_song.authors_songs.append(mock_author_song)
mock_author = MagicMock() mock_author = MagicMock()
mock_author.display_name = 'translator' mock_author.display_name = 'translator'
mock_author_song = MagicMock() mock_author_song = MagicMock()
mock_author_song.author = mock_author mock_author_song.author = mock_author
mock_author_song.author_type=AuthorType.Translation mock_author_song.author_type = AuthorType.Translation
mock_song.authors_songs.append(mock_author_song) mock_song.authors_songs.append(mock_author_song)
mock_song.copyright = 'My copyright' mock_song.copyright = 'My copyright'
service_item = ServiceItem(None) service_item = ServiceItem(None)