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 2016-06-14 22:36:51 +02:00
parent 41c0d3fcf9
commit 4fc4fa8969
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/plugins/songs/lib/importers/mediashout.py
View File

@ -47,7 +47,6 @@ class MediaShoutImport(SongImport):
Initialise the MediaShout importer. Initialise the MediaShout importer.
""" """
super(MediaShoutImport, self).__init__(manager, **kwargs) super(MediaShoutImport, self).__init__(manager, **kwargs)
#SongImport.__init__(self, manager, **kwargs)
def do_import(self): def do_import(self):
""" """
@ -70,9 +69,11 @@ class MediaShoutImport(SongImport):
topics = [] topics = []
if self.stop_import_flag: if self.stop_import_flag:
break break
cursor.execute('SELECT Type, Number, Text FROM Verses WHERE Record = ? ORDER BY Type, Number', float(song.Record)) cursor.execute('SELECT Type, Number, Text FROM Verses WHERE Record = ? ORDER BY Type, Number',
float(song.Record))
verses = cursor.fetchall() verses = cursor.fetchall()
cursor.execute('SELECT Type, Number, POrder FROM PlayOrder WHERE Record = ? ORDER BY POrder', float(song.Record)) cursor.execute('SELECT Type, Number, POrder FROM PlayOrder WHERE Record = ? ORDER BY POrder',
float(song.Record))
verse_order = cursor.fetchall() verse_order = cursor.fetchall()
if cursor.tables(table='TableName', tableType='TABLE').fetchone(): if cursor.tables(table='TableName', tableType='TABLE').fetchone():
cursor.execute('SELECT Name FROM Themes INNER JOIN SongThemes ON SongThemes.ThemeId = Themes.ThemeId ' cursor.execute('SELECT Name FROM Themes INNER JOIN SongThemes ON SongThemes.ThemeId = Themes.ThemeId '

1
openlp/plugins/songs/lib/importers/videopsalm.py
View File

@ -118,4 +118,3 @@ class VideoPsalmImport(SongImport):
self.log_error('Could not import {title}'.format(title=self.title)) self.log_error('Could not import {title}'.format(title=self.title))
except Exception as e: except Exception as e:
self.log_error(song_file.name, translate('SongsPlugin.VideoPsalmImport', 'Error: {error}').format(error=e)) self.log_error(song_file.name, translate('SongsPlugin.VideoPsalmImport', 'Error: {error}').format(error=e))