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

merged two methods in to one and made them module level

This commit is contained in:
Philip Ridout 2013-08-19 20:17:09 +00:00
parent 9f7e32cd31
commit 5e6d30f750
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openlp/plugins/songs/lib/xml.py
View File

@ -78,6 +78,17 @@ log = logging.getLogger(__name__)
NAMESPACE = u'http://openlyrics.info/namespace/2009/song'
NSMAP = '{' + NAMESPACE + '}' + '%s'
def clean_xml_string(xml):
"""
Filter out invalid characters in xml
Source <http://stackoverflow.com/questions/8733233/filtering-out-certain-bytes-in-python>
"""
return ''.join(char for char in xml if
0x20 <= char <= 0xD7FF
or char in (0x9, 0xA, 0xD)
or 0xE000 <= char <= 0xFFFD
or 0x10000 <= char <= 0x10FFFF)
class SongXML(object):
"""
@ -92,27 +103,6 @@ class SongXML(object):
self.song_xml = objectify.fromstring(u'<song version="1.0" />')
self.lyrics = etree.SubElement(self.song_xml, u'lyrics')
@staticmethod
def valid_xml_char_ordinal(char):
"""
Control Characters we need to filter from the xml.
Source <http://stackoverflow.com/questions/8733233/filtering-out-certain-bytes-in-python>
"""
return (
0x20 <= char <= 0xD7FF
or char in (0x9, 0xA, 0xD)
or 0xE000 <= char <= 0xFFFD
or 0x10000 <= char <= 0x10FFFF
)
@staticmethod
def clean_xml_string(xml):
"""
Filter out invalid characters in xml
Source <http://stackoverflow.com/questions/8733233/filtering-out-certain-bytes-in-python>
"""
return ''.join(char for char in xml if SongXML.valid_xml_char_ordinal(ord(char)))
def add_verse_to_lyrics(self, type, number, content, lang=None):
"""
Add a verse to the ``<lyrics>`` tag.
@ -133,7 +123,7 @@ class SongXML(object):
The verse's language code (ISO-639). This is not required, but
should be added if available.
"""
content = self.clean_xml_string(content)
content = clean_xml_string(content)
verse = etree.Element(u'verse', type=unicode(type),
label=unicode(number))
if lang: