forked from openlp/openlp
Remove empty lines from EW6 importer methods.
This commit is contained in:
parent
b4f461c54f
commit
3f56ca482e
@ -373,14 +373,12 @@ class EasyWorshipSongImport(SongImport):
|
|||||||
songs_conn.close()
|
songs_conn.close()
|
||||||
words_conn.close()
|
words_conn.close()
|
||||||
return
|
return
|
||||||
|
|
||||||
# Take a stab at how text is encoded
|
# Take a stab at how text is encoded
|
||||||
self.encoding = 'cp1252'
|
self.encoding = 'cp1252'
|
||||||
self.encoding = retrieve_windows_encoding(self.encoding)
|
self.encoding = retrieve_windows_encoding(self.encoding)
|
||||||
if not self.encoding:
|
if not self.encoding:
|
||||||
log.debug('No encoding set.')
|
log.debug('No encoding set.')
|
||||||
return
|
return
|
||||||
|
|
||||||
# import songs
|
# import songs
|
||||||
songs = songs_db.execute('SELECT rowid,title,author,copyright,vendor_id FROM song;')
|
songs = songs_db.execute('SELECT rowid,title,author,copyright,vendor_id FROM song;')
|
||||||
for song in songs:
|
for song in songs:
|
||||||
@ -397,7 +395,6 @@ class EasyWorshipSongImport(SongImport):
|
|||||||
translate('SongsPlugin.EasyWorshipSongImport',
|
translate('SongsPlugin.EasyWorshipSongImport',
|
||||||
'"{title}" could not be imported. {entry}').
|
'"{title}" could not be imported. {entry}').
|
||||||
format(title=title, entry=self.entry_error_log))
|
format(title=title, entry=self.entry_error_log))
|
||||||
|
|
||||||
# close database handles
|
# close database handles
|
||||||
songs_conn.close()
|
songs_conn.close()
|
||||||
words_conn.close()
|
words_conn.close()
|
||||||
|
Loading…
Reference in New Issue
Block a user