Helpviewer/OpenSearch/OpenSearchEngine.py

branch
6_0_x
changeset 4330
2c278493b31e
parent 4159
ba30f95a0ec2
child 4333
ec0664f353b3
diff -r 399e14805a5c -r 2c278493b31e Helpviewer/OpenSearch/OpenSearchEngine.py
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Fri Jul 24 18:44:45 2015 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Sat Jul 25 12:58:42 2015 +0200
@@ -151,7 +151,7 @@
             return QUrl()
         
         ret = QUrl.fromEncoded(
-            self.parseTemplate(searchTerm, self._searchUrlTemplate))
+            self.parseTemplate(searchTerm, self._searchUrlTemplate).encode("utf-8"))
         
         if self.__searchMethod != "post":
             if qVersion() >= "5.0.0":
@@ -206,7 +206,7 @@
             return QUrl()
         
         ret = QUrl.fromEncoded(QByteArray(self.parseTemplate(
-            searchTerm, self._suggestionsUrlTemplate)))
+            searchTerm, self._suggestionsUrlTemplate).encode("utf-8")))
         
         if self.__searchMethod != "post":
             if qVersion() >= "5.0.0":
@@ -337,7 +337,7 @@
             return
         
         reply = self.__networkAccessManager.get(
-            QNetworkRequest(QUrl.fromEncoded(self._imageUrl)))
+            QNetworkRequest(QUrl.fromEncoded(self._imageUrl.encode("utf-8"))))
         reply.finished.connect(self.__imageObtained)
         self.__replies.append(reply)
     
@@ -359,7 +359,7 @@
         if response.isEmpty():
             return
         
-        if response.startsWith("<html>") or response.startsWith("HTML"):
+        if response.startsWith(b"<html>") or response.startsWith(b"HTML"):
             self.__iconMoved = True
             self.__image = QImage()
         else:

eric ide

mercurial