From cec487be858bd5be357113590fedc328dfcd77c9 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Fri, 4 Mar 2011 13:57:39 +0000 Subject: [PATCH 1/2] Unused imports --- openlp/plugins/bibles/lib/csvbible.py | 2 -- openlp/plugins/bibles/lib/openlp1.py | 2 -- openlp/plugins/bibles/lib/opensong.py | 2 -- openlp/plugins/bibles/lib/osis.py | 2 -- 4 files changed, 8 deletions(-) diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py index 18bf06cfb..b96382df2 100644 --- a/openlp/plugins/bibles/lib/csvbible.py +++ b/openlp/plugins/bibles/lib/csvbible.py @@ -69,8 +69,6 @@ import logging import chardet import csv -from PyQt4 import QtCore - from openlp.core.lib import Receiver, translate from openlp.plugins.bibles.lib.db import BibleDB, Testament diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py index 03011fa5e..2d19db20c 100644 --- a/openlp/plugins/bibles/lib/openlp1.py +++ b/openlp/plugins/bibles/lib/openlp1.py @@ -27,8 +27,6 @@ import logging import sqlite -from PyQt4 import QtCore - from openlp.core.lib import Receiver from openlp.core.ui.wizard import WizardStrings from openlp.plugins.bibles.lib.db import BibleDB diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index 356483986..a7f1eff33 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -25,9 +25,7 @@ ############################################################################### import logging - from lxml import objectify -from PyQt4 import QtCore from openlp.core.lib import Receiver, translate from openlp.plugins.bibles.lib.db import BibleDB diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index 000471b96..78e2551d9 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -31,8 +31,6 @@ import chardet import codecs import re -from PyQt4 import QtCore - from openlp.core.lib import Receiver, translate from openlp.core.utils import AppLocation from openlp.plugins.bibles.lib.db import BibleDB From 2cd7c2c66e8f99cc86924d1a72e66731903a7afa Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Fri, 4 Mar 2011 14:44:21 +0000 Subject: [PATCH 2/2] Cleanups --- openlp/core/ui/screen.py | 2 +- openlp/plugins/songs/forms/songexportform.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/screen.py b/openlp/core/ui/screen.py index 9f8191961..6b4978727 100644 --- a/openlp/core/ui/screen.py +++ b/openlp/core/ui/screen.py @@ -123,7 +123,7 @@ class ScreenList(object): [u'Screen 1 (primary)', u'Screen 2'] """ - screen_list= [] + screen_list = [] for screen in self.screen_list: screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'), screen[u'number'] + 1) diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py index dbcff42f3..d8bc8b3a6 100644 --- a/openlp/plugins/songs/forms/songexportform.py +++ b/openlp/plugins/songs/forms/songexportform.py @@ -355,7 +355,8 @@ class SongExportForm(OpenLPWizard): the path to *directoryLineEdit*. """ path = unicode(QtGui.QFileDialog.getExistingDirectory(self, - translate('SongsPlugin.ExportWizardForm', 'Select Destination Folder'), + translate('SongsPlugin.ExportWizardForm', + 'Select Destination Folder'), SettingsManager.get_last_dir(self.plugin.settingsSection, 1), options=QtGui.QFileDialog.ShowDirsOnly)) SettingsManager.set_last_dir(self.plugin.settingsSection, path, 1)