eric: comparison Helpviewer/OpenSearch/OpenSearchEngine.py

-:9986ec0e559a
+:10516539f238
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 import re
 import json
-from PyQt4.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, QBuffer, \
+from PyQt4.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \
-QIODevice, QObject
+QBuffer, QIODevice, QObject
 from PyQt4.QtGui import QImage
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkAccessManager
 from UI.Info import Program
 result = result.replace("{startPage}", "0")
 result = result.replace("{language}", language)
 result = result.replace("{country}", country)
 result = result.replace("{inputEncoding}", "UTF-8")
 result = result.replace("{outputEncoding}", "UTF-8")
-result = result.replace("{searchTerms}",
+result = result.replace(
-bytes(QUrl.toPercentEncoding(searchTerm)).decode())
+"{searchTerms}",
+bytes(QUrl.toPercentEncoding(searchTerm)).decode())
 result = re.sub(r"""\{([^\}]*:|)source\??\}""", Program, result)
 return result
 @pyqtSlot(result=str)
 @return URL (QUrl)
 """
 if not self._searchUrlTemplate:
 return QUrl()
-ret = QUrl.fromEncoded(self.parseTemplate(searchTerm, self._searchUrlTemplate))
+ret = QUrl.fromEncoded(
+self.parseTemplate(searchTerm, self._searchUrlTemplate))
 if self.__searchMethod != "post":
 for parameter in self._searchParameters:
 ret.addQueryItem(parameter[0],
 self.parseTemplate(searchTerm, parameter[1]))
 def setSearchParameters(self, searchParameters):
 """
 Public method to set the engine search parameters.
-@param searchParameters search parameters of the engine (list of two tuples)
+@param searchParameters search parameters of the engine
+(list of two tuples)
 """
 self._searchParameters = searchParameters[:]
 def suggestionsParameters(self):
 """
 """
 self._suggestionsParameters = suggestionsParameters[:]
 def searchMethod(self):
 """
-Public method to get the HTTP request method used to perform search requests.
+Public method to get the HTTP request method used to perform search
+requests.
 @return HTTP request method (string)
 """
 return self.__searchMethod
 def setSearchMethod(self, method):
 """
-Public method to set the HTTP request method used to perform search requests.
+Public method to set the HTTP request method used to perform search
+requests.
 @param method HTTP request method (string)
 """
 requestMethod = method.lower()
 if requestMethod not in self.__requestMethods:
 self.__searchMethod = requestMethod
 def suggestionsMethod(self):
 """
-Public method to get the HTTP request method used to perform suggestions requests.
+Public method to get the HTTP request method used to perform
+suggestions requests.
 @return HTTP request method (string)
 """
 return self.__suggestionsMethod
 def setSuggestionsMethod(self, method):
 """
-Public method to set the HTTP request method used to perform suggestions requests.
+Public method to set the HTTP request method used to perform
+suggestions requests.
 @param method HTTP request method (string)
 """
 requestMethod = method.lower()
 if requestMethod not in self.__requestMethods:
 def setImageUrl(self, imageUrl):
 """
 Public method to set the engine image URL.
-@param description image URL of the engine (string)
+@param imageUrl image URL of the engine (string)
 """
 self._imageUrl = imageUrl
 def setImageUrlAndLoad(self, imageUrl):
 """
 Public method to set the engine image URL.
-@param description image URL of the engine (string)
+@param imageUrl image URL of the engine (string)
 """
 self.setImageUrl(imageUrl)
 self.__iconMoved = False
 self.loadImage()
 """
 if not self._imageUrl:
 imageBuffer = QBuffer()
 imageBuffer.open(QIODevice.ReadWrite)
 if image.save(imageBuffer, "PNG"):
-self._imageUrl = "data:image/png;base64,{0}"\
+self._imageUrl = "data:image/png;base64,{0}".format(
-.format(bytes(imageBuffer.buffer().toBase64()).decode())
+bytes(imageBuffer.buffer().toBase64()).decode())
 self.__image = QImage(image)
 self.imageChanged.emit()
 def isValid(self):
 if self.__networkAccessManager is None:
 return
 if self.__suggestionsReply is not None:
-##            self.__suggestionsReply.finished[()].disconnect(self.__suggestionsObtained)
 self.__suggestionsReply.abort()
 self.__suggestionsReply.deleteLater()
 self.__suggestionsReply = None
 if self.__suggestionsMethod not in self.__requestMethods:
 for parameter in self._suggestionsParameters:
 parameters.append(parameter[0] + "=" + parameter[1])
 data = "&".join(parameters)
 self.__suggestionsReply = self.networkAccessManager().post(
 QNetworkRequest(self.suggestionsUrl(searchTerm)), data)
-self.__suggestionsReply.finished[()].connect(self.__suggestionsObtained)
+self.__suggestionsReply.finished[()].connect(
+self.__suggestionsObtained)
 def __suggestionsObtained(self):
 """
 Private slot to receive the suggestions.
 """
 def networkAccessManager(self):
 """
 Public method to get a reference to the network access manager object.
-@return reference to the network access manager object (QNetworkAccessManager)
+@return reference to the network access manager object
+(QNetworkAccessManager)
 """
 return self.__networkAccessManager
 def setNetworkAccessManager(self, networkAccessManager):
 """

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/OpenSearch/OpenSearchEngine.py

Helpviewer/OpenSearch/OpenSearchEngine.py