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

changed variables to result

This commit is contained in:
phill-ridout 2013-02-03 21:00:22 +00:00
parent 59c6e00bf1
commit 98d2247f10
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,10 +180,10 @@ class EasyWorshipSongImport(SongImport):
self.addAuthor(author_name.strip())
if words:
# Format the lyrics
words = strip_rtf(words, self.encoding)
if words is None:
result = strip_rtf(words, self.encoding)
if result is None:
return
words, self.encoding = words
words, self.encoding = result
verse_type = VerseType.Tags[VerseType.Verse]
for verse in SLIDE_BREAK_REGEX.split(words):
verse = verse.strip()

6
openlp/plugins/songs/lib/songproimport.py
View File

@ -109,10 +109,10 @@ class SongProImport(SongImport):
self.finish()
return
if u'rtf1' in text:
text = strip_rtf(text, self.encoding)
if text is None:
result = strip_rtf(text, self.encoding)
if result is None:
return
text, self.encoding = text
text, self.encoding = result
text = text.rstrip()
if not text:
return

6
openlp/plugins/songs/lib/sundayplusimport.py
View File

@ -150,10 +150,10 @@ class SundayPlusImport(SongImport):
verse_type = HOTKEY_TO_VERSE_TYPE[value]
if name == 'rtf':
value = self.unescape(value)
verse = strip_rtf(value, self.encoding)
if verse is None:
result = strip_rtf(value, self.encoding)
if result is None:
return
verse, self.encoding = verse
verse, self.encoding = result
lines = verse.strip().split('\n')
# If any line inside any verse contains CCLI or
# only Public Domain, we treat this as special data: