From e7b4e1640579ac5bea654391e3eb4542b2e2cbb3 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sun, 20 Jun 2010 14:03:06 +0100 Subject: [PATCH] Couple o' Cleanups --- openlp/plugins/songs/forms/editsongform.py | 5 +++-- openlp/plugins/songs/lib/songimport.py | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index e3bec84c2..063fdd71f 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -649,12 +649,13 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): text = text + re.sub(r'\W+', u' ', unicode(self.VerseListWidget.item(i, 0).text())) + u' ' 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.lyrics = unicode(sxml.extract_xml(), u'utf-8') for verse in multiple: 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: log.exception(u'Problem processing song Lyrics \n%s', sxml.dump_xml()) diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py index 479828ddd..dbc9fa08d 100644 --- a/openlp/plugins/songs/lib/songimport.py +++ b/openlp/plugins/songs/lib/songimport.py @@ -23,7 +23,6 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -import string import re from PyQt4 import QtGui