forked from openlp/openlp
Couple o' Cleanups
This commit is contained in:
parent
700b41390e
commit
e7b4e16405
openlp/plugins/songs
@ -649,12 +649,13 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
text = text + re.sub(r'\W+', u' ',
|
text = text + re.sub(r'\W+', u' ',
|
||||||
unicode(self.VerseListWidget.item(i, 0).text())) + u' '
|
unicode(self.VerseListWidget.item(i, 0).text())) + u' '
|
||||||
if (bits[1] > u'1') and (bits[0][0] not in multiple):
|
if (bits[1] > u'1') and (bits[0][0] not in multiple):
|
||||||
multiple.append(bits[0][0])
|
multiple.append(bits[0][0])
|
||||||
self.song.search_lyrics = text
|
self.song.search_lyrics = text
|
||||||
self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
|
self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
|
||||||
for verse in multiple:
|
for verse in multiple:
|
||||||
self.song.verse_order = re.sub(u'([' + verse.upper() +
|
self.song.verse_order = re.sub(u'([' + verse.upper() +
|
||||||
verse.lower() + u'])(\W|$)', r'\g<1>1\2', self.song.verse_order)
|
verse.lower() + u'])(\W|$)', r'\g<1>1\2',
|
||||||
|
self.song.verse_order)
|
||||||
except:
|
except:
|
||||||
log.exception(u'Problem processing song Lyrics \n%s',
|
log.exception(u'Problem processing song Lyrics \n%s',
|
||||||
sxml.dump_xml())
|
sxml.dump_xml())
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
import string
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from PyQt4 import QtGui
|
from PyQt4 import QtGui
|
||||||
|
Loading…
Reference in New Issue
Block a user