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

Do not use depracated dict.has_key() function in openlyrics code

Browse Source
This commit is contained in:
Martin Zibricky 2011-09-06 15:22:17 +02:00
parent 5d2bde01c2
commit 6163bc99c3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,7 @@ from openlp.core.utils import get_application_version
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class SongXML(object): class SongXML(object):
""" """
This class builds and parses the XML used to describe songs. This class builds and parses the XML used to describe songs.
@ -250,6 +251,7 @@ class OpenLyrics(object):
""" """
IMPLEMENTED_VERSION = u'0.8' IMPLEMENTED_VERSION = u'0.8'
def __init__(self, manager): def __init__(self, manager):
self.manager = manager self.manager = manager
@ -318,7 +320,7 @@ class OpenLyrics(object):
verse_def = verse_tag + verse_number verse_def = verse_tag + verse_number
verse_element = \ verse_element = \
self._add_text_to_element(u'verse', lyrics, None, verse_def) self._add_text_to_element(u'verse', lyrics, None, verse_def)
if verse[0].has_key(u'lang'): if u'lang' in verse[0]:
verse_element.set(u'lang', verse[0][u'lang']) verse_element.set(u'lang', verse[0][u'lang'])
# Create a list with all "virtual" verses. # Create a list with all "virtual" verses.
virtual_verses = verse[1].split(u'[---]') virtual_verses = verse[1].split(u'[---]')
@ -549,10 +551,10 @@ class OpenLyrics(object):
# breaks. In OpenLyrics 0.7 an attribute has been added. # breaks. In OpenLyrics 0.7 an attribute has been added.
if song_xml.get(u'modifiedIn') in (u'1.9.6', u'OpenLP 1.9.6') and \ if song_xml.get(u'modifiedIn') in (u'1.9.6', u'OpenLP 1.9.6') and \
song_xml.get(u'version') == u'0.7' and \ song_xml.get(u'version') == u'0.7' and \
verses.has_key((verse_tag, verse_number, lang)): (verse_tag, verse_number, lang) in verses:
verses[(verse_tag, verse_number, lang)] += u'\n[---]\n' + text verses[(verse_tag, verse_number, lang)] += u'\n[---]\n' + text
# Merge v1a, v1b, .... to v1. # Merge v1a, v1b, .... to v1.
elif verses.has_key((verse_tag, verse_number, lang)): elif (verse_tag, verse_number, lang) in verses:
verses[(verse_tag, verse_number, lang)] += u'\n' + text verses[(verse_tag, verse_number, lang)] += u'\n' + text
else: else:
verses[(verse_tag, verse_number, lang)] = text verses[(verse_tag, verse_number, lang)] = text