openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/working into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


My turn for cleanups!
-- 
https://code.launchpad.net/~trb143/openlp/working/+merge/26197
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/working into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2010-05-25 23:47:26 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2010-05-27 16:01:32 +0000
@@ -324,10 +324,10 @@
             #no verse list or only 1 space (in error)
             if not song.verse_order or not song.verse_order.strip():
                 for verse in verseList:
-                    verseTag = u'%s:%s' % (
+                    verse_tag = u'%s:%s' % (
                         verse[0][u'type'], verse[0][u'label'])
                     service_item.add_from_text(\
-                        verse[1][:30], unicode(verse[1]), verseTag)
+                        verse[1][:30], unicode(verse[1]), verse_tag)
             else:
                 #Loop through the verse list and expand the song accordingly.
                 for order in song.verse_order.upper().split(u' '):
@@ -339,16 +339,16 @@
                                 or verse[0][u'type'] == "Chorus":
                                 if verse[0][u'label'] == order[1:] and \
                                     verse[0][u'type'][0] == order[0]:
-                                    verseTag = u'%s:%s' % \
+                                    verse_tag = u'%s:%s' % \
                                         (verse[0][u'type'], verse[0][u'label'])
                                     service_item.add_from_text\
-                                        (verse[1][:30], verse[1], verseTag)
+                                        (verse[1][:30], verse[1], verse_tag)
                             else:
                                 if verse[0][u'type'][0] == order[0]:
-                                    verseTag = u'%s:%s' % \
+                                    verse_tag = u'%s:%s' % \
                                         (verse[0][u'type'], verse[0][u'label'])
                                     service_item.add_from_text\
-                                        (verse[1][:30], verse[1], verseTag)
+                                        (verse[1][:30], verse[1], verse_tag)
         else:
             verses = song.lyrics.split(u'\n\n')
             for slide in verses: