openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/bug-952254 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #952254 in OpenLP: "OpenLP crash when opening service"
  https://bugs.launchpad.net/openlp/+bug/952254

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/bug-952254/+merge/96921

Fix the error introduced in r1896 which prevents services being loaded.
Lets pick a variable name that isn't already being used.
-- 
https://code.launchpad.net/~j-corwin/openlp/bug-952254/+merge/96921
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/bug-952254 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py	2012-03-09 06:19:39 +0000
+++ openlp/plugins/songs/lib/xml.py	2012-03-11 16:07:21 +0000
@@ -681,14 +681,14 @@
                 unicode(translate('OpenLP.OpenLyricsImportError',
                 '<lyrics> tag is missing.')))
         try:
-            verses = lyrics.verse
+            verse_list = lyrics.verse
         except AttributeError:
             raise OpenLyricsError(OpenLyricsError.VerseError,
                 '<verse> tag is missing.',
                 unicode(translate('OpenLP.OpenLyricsImportError',
                 '<verse> tag is missing.')))
         # Loop over the "verse" elements.
-        for verse in verses:
+        for verse in verse_list:
             text = u''
             # Loop over the "lines" elements.
             for lines in verse.lines: