openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #01272
[Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Unused variables and import fixes
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/21978
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/migration/migratebibles.py'
--- openlp/migration/migratebibles.py 2010-03-22 19:44:06 +0000
+++ openlp/migration/migratebibles.py 2010-03-23 19:59:13 +0000
@@ -27,9 +27,9 @@
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 @@
conn.commit()
conn.execute(u'vacuum;')
conn.commit()
-
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2010-03-21 23:58:01 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2010-03-23 19:59:13 +0000
@@ -498,7 +498,6 @@
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 @@
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'')
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2010-03-21 23:58:01 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2010-03-23 19:59:13 +0000
@@ -282,7 +282,7 @@
raw_footer = []
author_list = u''
author_audit = []
- ccl = u''
+ ccli = u''
if self.remoteTriggered is None:
item = self.ListView.currentItem()
if item is None:
=== modified file 'scripts/bible-1to2-converter.py'
--- scripts/bible-1to2-converter.py 2010-03-21 23:58:01 +0000
+++ scripts/bible-1to2-converter.py 2010-03-23 19:59:13 +0000
@@ -206,7 +206,6 @@
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])
Follow ups