openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #01596
[Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Import and unused variable fixes
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/25708
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py 2010-05-04 21:49:02 +0000
+++ openlp/plugins/remotes/lib/httpserver.py 2010-05-20 17:56:25 +0000
@@ -314,7 +314,7 @@
"""
if not self.socket:
return
- html = self.send_408_timeout()
+ self.send_408_timeout()
self.close()
def disconnected(self):
@@ -334,4 +334,3 @@
self.socket.close()
self.socket = None
self.parent.close_connection(self)
-
=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py 2010-05-01 12:10:48 +0000
+++ openlp/plugins/remotes/remoteplugin.py 2010-05-20 17:56:25 +0000
@@ -25,9 +25,7 @@
import logging
-from PyQt4 import QtNetwork, QtCore
-
-from openlp.core.lib import Plugin, Receiver
+from openlp.core.lib import Plugin
from openlp.plugins.remotes.lib import RemoteTab, HttpServer
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2010-05-17 20:48:16 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2010-05-20 17:56:25 +0000
@@ -23,10 +23,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-import csv
import logging
-import os
-import os.path
from PyQt4 import QtCore, QtGui
=== modified file 'scripts/translation_utils.py'
--- scripts/translation_utils.py 2010-05-12 21:44:00 +0000
+++ scripts/translation_utils.py 2010-05-20 17:56:25 +0000
@@ -49,9 +49,7 @@
, u"pt_BR"
, u"es"
, u"sv"]
-
-
-
+
def write_file(filename, stringlist):
content = u''
for line in stringlist:
@@ -76,7 +74,6 @@
help="proceed all options")
(options, args) = parser.parse_args()
- qt_args = []
if options.download:
downloadTranslations()
elif options.prepare:
Follow ups