openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Revert some of 1036 as causes Songs to fail to save.  
Bug 691952
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/44365
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2010-12-18 17:11:21 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2010-12-21 16:38:53 +0000
@@ -736,7 +736,8 @@
                 verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
                 bits = verseId.split(u':')
                 sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
-                text = text + whitespace.sub(u' ',
+                # text = text + whitespace.sub(u' ',
+                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])