From ac557714ef35b66c25439542d1824049979c9d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= Date: Thu, 15 Dec 2011 00:39:52 +0200 Subject: [PATCH] Fix for 860876, a bug where web remote returns wrongly decoded alert message. It also fixes no search results when searching words with non-ascii characters. Fixes: https://launchpad.net/bugs/860876 --- openlp/plugins/remotes/lib/httpserver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py index acbe103a7..3dc5d276d 100644 --- a/openlp/plugins/remotes/lib/httpserver.py +++ b/openlp/plugins/remotes/lib/httpserver.py @@ -315,7 +315,9 @@ class HttpConnection(object): """ log.debug(u'ready to read socket') if self.socket.canReadLine(): - data = unicode(self.socket.readLine()).encode(u'utf-8') + data = self.socket.readLine() + data = QtCore.QByteArray.fromPercentEncoding(data) + data = unicode(data, 'utf8') log.debug(u'received: ' + data) words = data.split(u' ') response = None