Andreas Preikschat has proposed merging lp:~googol/openlp/trivial into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol/openlp/trivial/+merge/101741
Hello,
- trivial clean ups
--
https://code.launchpad.net/~googol/openlp/trivial/+merge/101741
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol/openlp/trivial into lp:openlp.
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2012-02-26 15:15:00 +0000
+++ openlp/core/lib/__init__.py 2012-04-12 14:21:22 +0000
@@ -29,8 +29,7 @@
OpenLP work.
"""
import logging
-import os.path
-import types
+import os
from PyQt4 import QtCore, QtGui, Qt
=== modified file 'openlp/core/lib/listwidgetwithdnd.py'
--- openlp/core/lib/listwidgetwithdnd.py 2011-12-27 10:33:55 +0000
+++ openlp/core/lib/listwidgetwithdnd.py 2012-04-12 14:21:22 +0000
@@ -27,7 +27,7 @@
"""
Extend QListWidget to handle drag and drop functionality
"""
-import os.path
+import os
from PyQt4 import QtCore, QtGui
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py 2012-01-18 13:50:06 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py 2012-04-12 14:21:22 +0000
@@ -29,7 +29,6 @@
"""
import logging
import os
-import os.path
import locale
from PyQt4 import QtCore, QtGui
=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py 2012-03-01 18:09:47 +0000
+++ openlp/plugins/bibles/lib/osis.py 2012-04-12 14:21:22 +0000
@@ -26,7 +26,6 @@
###############################################################################
import os
-import os.path
import logging
import chardet
import codecs
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2012-04-03 17:59:34 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2012-04-12 14:21:22 +0000
@@ -376,17 +376,17 @@
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())
=== modified file 'testing/run.py'
--- testing/run.py 2011-09-02 11:15:41 +0000
+++ testing/run.py 2012-04-12 14:21:22 +0000
@@ -34,7 +34,7 @@
"""
-import os.path
+import os
import sys
TESTS_PATH = os.path.dirname(os.path.abspath(__file__))
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
