keep copyright field empty if imported song does not have any copyright information

This commit is contained in:
Andreas Preikschat 2010-12-17 15:28:19 +01:00
parent 3cdac511e2
commit fa79dd2cca
2 changed files with 4 additions and 1 deletions

View File

@ -44,6 +44,7 @@ class ServiceItemType(object):
Image = 2
Command = 3
class ItemCapabilities(object):
"""
Provides an enumeration of a serviceitem's capabilities

View File

@ -297,6 +297,8 @@ class OpenLyricsParser(object):
song_xml = objectify.fromstring(xml)
properties = song_xml.properties
song.copyright = unicode(properties.copyright.text)
if song.copyright == u'None':
song.copyright = u''
song.verse_order = unicode(properties.verseOrder.text)
if song.verse_order == u'None':
song.verse_order = u''
@ -357,7 +359,7 @@ class OpenLyricsParser(object):
def _add_text_to_element(self, tag, parent, text=None, label=None):
if label:
element = etree.Element(tag, name = unicode(label))
element = etree.Element(tag, name=unicode(label))
else:
element = etree.Element(tag)
if text: