From 620d858d68b7384b0b90f6efadf9965aeee4e755 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 12 Apr 2012 16:16:12 +0200 Subject: [PATCH 1/2] clean ups --- openlp/core/lib/__init__.py | 3 +-- openlp/core/lib/listwidgetwithdnd.py | 2 +- openlp/plugins/bibles/forms/bibleimportform.py | 1 - openlp/plugins/bibles/lib/osis.py | 1 - openlp/plugins/songs/forms/editsongdialog.py | 12 ++++++------ testing/run.py | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 4403ac8ec..8b01351cb 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -29,8 +29,7 @@ The :mod:`lib` module contains most of the components and libraries that make OpenLP work. """ import logging -import os.path -import types +import os from PyQt4 import QtCore, QtGui, Qt diff --git a/openlp/core/lib/listwidgetwithdnd.py b/openlp/core/lib/listwidgetwithdnd.py index 67fa45f74..9e9787914 100644 --- a/openlp/core/lib/listwidgetwithdnd.py +++ b/openlp/core/lib/listwidgetwithdnd.py @@ -27,7 +27,7 @@ """ Extend QListWidget to handle drag and drop functionality """ -import os.path +import os from PyQt4 import QtCore, QtGui diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index ee7b5a063..cc50fdf9b 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -29,7 +29,6 @@ The bible import functions for OpenLP """ import logging import os -import os.path import locale from PyQt4 import QtCore, QtGui diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index 4afee912d..1ce3df887 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -26,7 +26,6 @@ ############################################################################### import os -import os.path import logging import chardet import codecs diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 2dbfdc3b5..6143da40d 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -376,17 +376,17 @@ class SingleColumnTableWidget(QtGui.QTableWidget): Class to for a single column table widget to use for the verse table widget. """ def __init__(self, parent): - """ - Constrctor - """ + """ + Constrctor + """ QtGui.QTableWidget.__init__(self, parent) self.horizontalHeader().setVisible(False) self.setColumnCount(1) def resizeEvent(self, event): - """ - Resize the first column together with the widget. - """ + """ + Resize the first column together with the widget. + """ QtGui.QTableWidget.resizeEvent(self, event) if self.columnCount(): self.setColumnWidth(0, event.size().width()) diff --git a/testing/run.py b/testing/run.py index 1f0f54858..b91d32e59 100755 --- a/testing/run.py +++ b/testing/run.py @@ -34,7 +34,7 @@ simply run this script:: """ -import os.path +import os import sys TESTS_PATH = os.path.dirname(os.path.abspath(__file__)) From 3414763fff478a1711efe082cf6c36ff52028675 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 15 Apr 2012 12:16:01 +0200 Subject: [PATCH 2/2] fixed spelling --- openlp/plugins/songs/forms/editsongdialog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 6143da40d..42c011819 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -377,7 +377,7 @@ class SingleColumnTableWidget(QtGui.QTableWidget): """ def __init__(self, parent): """ - Constrctor + Constructor """ QtGui.QTableWidget.__init__(self, parent) self.horizontalHeader().setVisible(False)