From b100731dc4b2ff86c07932806d217c5143823fd0 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Thu, 12 Nov 2009 00:44:26 +0000
Subject: [PATCH] A unicode fix for songs

---
 openlp/core/lib/songxmlhandler.py     | 6 ++++--
 openlp/plugins/songs/lib/mediaitem.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openlp/core/lib/songxmlhandler.py b/openlp/core/lib/songxmlhandler.py
index 4543464bb..37bbe25e4 100644
--- a/openlp/core/lib/songxmlhandler.py
+++ b/openlp/core/lib/songxmlhandler.py
@@ -134,7 +134,8 @@ class SongXMLParser(object):
             The XML of the song to be parsed.
         """
         try:
-            self.song_xml = ElementTree(element=XML(xml))
+            self.song_xml = ElementTree(
+                element=XML(unicode(xml).encode('unicode-escape')))
         except:
             log.exception(u'Invalid xml %s', xml)
 
@@ -147,7 +148,8 @@ class SongXMLParser(object):
         verse_list = []
         for element in iter:
             if element.tag == u'verse':
-                verse_list.append([element.attrib, element.text])
+                verse_list.append([element.attrib,
+                    unicode(element.text).decode('unicode-escape')])
         return verse_list
 
     def dump_xml(self):
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 33ee028e2..f69faed8b 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -291,7 +291,7 @@ class SongMediaItem(MediaManagerItem):
         service_item.editId = item_id
         service_item.verse_order = song.verse_order
         if song.lyrics.startswith(u'<?xml version='):
-            songXML=SongXMLParser(song.lyrics)
+            songXML = SongXMLParser(song.lyrics)
             verseList = songXML.get_verses()
             for verse in verseList:
                 if verse[1]: