From 2f840944e9b3a3a7b8361799723a63084ddb1beb Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Sun, 21 Mar 2010 15:55:45 +0000
Subject: [PATCH 1/2] Unused variable fixes

---
 openlp/plugins/songs/forms/editsongform.py | 2 --
 openlp/plugins/songs/lib/mediaitem.py      | 2 +-
 scripts/bible-1to2-converter.py            | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 183af6a44..fedd18759 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -498,7 +498,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             sxml = SongXMLBuilder()
             sxml.new_document()
             sxml.add_lyrics_to_song()
-            count = 1
             text = u' '
             for i in range (0, self.VerseListWidget.count()):
                 item = self.VerseListWidget.item(i)
@@ -506,7 +505,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 bits = verseId.split(u':')
                 sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
                 text = text + unicode(self.VerseListWidget.item(i).text()) + u' '
-                count += 1
             text = text.replace(u'\'', u'')
             text = text.replace(u',', u'')
             text = text.replace(u';', u'')
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index cd440e54f..5090b845c 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -282,7 +282,7 @@ class SongMediaItem(MediaManagerItem):
         raw_footer = []
         author_list = u''
         author_audit = []
-        ccl = u''
+        ccli = u''
         if self.remoteTriggered is None:
             item = self.ListView.currentItem()
             if item is None:
diff --git a/scripts/bible-1to2-converter.py b/scripts/bible-1to2-converter.py
index b1e9b6897..19d8ec9e8 100755
--- a/scripts/bible-1to2-converter.py
+++ b/scripts/bible-1to2-converter.py
@@ -206,7 +206,6 @@ def import_bible():
     rows = old_cursor.fetchall()
     if debug or verbose:
         print 'done.'
-    song_map = {}
     for row in rows:
         book_id = int(row[1])
         chapter = int(row[2])

From c4b49a15116a6c33aa4949b8d0e8d42e59978a19 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Tue, 23 Mar 2010 16:00:52 +0000
Subject: [PATCH 2/2] Import fixes

---
 openlp/migration/migratebibles.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openlp/migration/migratebibles.py b/openlp/migration/migratebibles.py
index b73b016cf..c0d47fdb8 100644
--- a/openlp/migration/migratebibles.py
+++ b/openlp/migration/migratebibles.py
@@ -27,9 +27,9 @@ import os
 import sys
 import sqlite3
 
-from sqlalchemy import  *
+from sqlalchemy import *
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
 
 from openlp.core.lib import PluginConfig
 from openlp.plugins.bibles.lib.models import *
@@ -223,4 +223,3 @@ class MigrateBibles():
         conn.commit()
         conn.execute(u'vacuum;')
         conn.commit()
-