From ca3e938afe08c6a76f2946d04da83c80fcdda0a1 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 7 Jul 2012 22:33:17 +0100 Subject: [PATCH] Remove redundant logging and incrementProgressBar --- openlp/plugins/songs/lib/mediashoutimport.py | 3 --- openlp/plugins/songs/lib/songproimport.py | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/openlp/plugins/songs/lib/mediashoutimport.py b/openlp/plugins/songs/lib/mediashoutimport.py index 5194b4b7b..f81b208ac 100644 --- a/openlp/plugins/songs/lib/mediashoutimport.py +++ b/openlp/plugins/songs/lib/mediashoutimport.py @@ -31,14 +31,11 @@ a MediaShout database into the OpenLP database. """ import re import os -import logging import pyodbc from openlp.core.lib import translate from openlp.plugins.songs.lib.songimport import SongImport -log = logging.getLogger(__name__) - VERSE_TAGS = [u'V', u'C', u'B', u'O', u'P', u'I', u'E'] class MediaShoutImport(SongImport): diff --git a/openlp/plugins/songs/lib/songproimport.py b/openlp/plugins/songs/lib/songproimport.py index 9f4148308..a813f0519 100644 --- a/openlp/plugins/songs/lib/songproimport.py +++ b/openlp/plugins/songs/lib/songproimport.py @@ -31,14 +31,11 @@ songs into the OpenLP database. """ import re import os -import logging from openlp.core.lib import translate from openlp.plugins.songs.lib import strip_rtf from openlp.plugins.songs.lib.songimport import SongImport -log = logging.getLogger(__name__) - class SongProImport(SongImport): """ The :class:`SongProImport` class provides the ability to import song files @@ -106,8 +103,8 @@ class SongProImport(SongImport): self.setDefaults() if text: self.title = text - self.importWizard.incrementProgressBar(u'Processing song ' + text, - 0) + #self.importWizard.incrementProgressBar(u'Processing song ' + text, + # 0) return elif tag == u'E': self.finish()