From ddcda85090c0f49de13767048fbc277f51759b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= Date: Tue, 18 Jan 2011 17:18:04 +0200 Subject: [PATCH] indentation fix, songbook number back to unicode, these sometimes contain letters like 104a --- openlp/plugins/songs/lib/easislidesimport.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easislidesimport.py index 571f9d047..fac376134 100644 --- a/openlp/plugins/songs/lib/easislidesimport.py +++ b/openlp/plugins/songs/lib/easislidesimport.py @@ -112,8 +112,8 @@ class EasiSlidesImport(SongImport): def _add_number(self, song): try: - number = int(song.SongNumber) - if number != 0: + number = unicode(song.SongNumber) + if number != u'0': self.song_number = number except UnicodeDecodeError: log.exception(u'Unicode decode error while decoding SongNumber') @@ -206,8 +206,7 @@ class EasiSlidesImport(SongImport): # if the song has regions regions = (len(regionlines) > 0) # if the regions are inside verses - regionsInVerses = (regions and \ - regionlines[regionlines.keys()[0]] > 1) + regionsInVerses = (regions and regionlines[regionlines.keys()[0]] > 1) MarkTypes = { u'CHORUS': u'C', u'VERSE': u'V',