--- a/Helpviewer/OpenSearch/OpenSearchManager.py Tue Oct 15 22:03:54 2013 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Fri Oct 18 23:00:41 2013 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice, QByteArray, \ - QBuffer +from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice, \ + QByteArray, QBuffer from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply from E5Gui.E5Application import e5App @@ -124,6 +124,7 @@ Public method to check, if an engine exists. @param name name of the engine (string) + @return flag indicating an existing engine (boolean) """ return name in self.__engines @@ -183,7 +184,8 @@ """ Private method to add a new search engine given a filename. - @param filename name of a file containing the engine definition (string) + @param filename name of a file containing the engine definition + (string) @return flag indicating success (boolean) """ file_ = QFile(filename) @@ -201,7 +203,8 @@ def __addEngineByEngine(self, engine): """ - Private method to add a new search engine given a reference to an engine. + Private method to add a new search engine given a reference to an + engine. @param engine reference to an engine object (OpenSearchEngine) @return flag indicating success (boolean) @@ -235,11 +238,13 @@ return engine = self.__engines[name] - for keyword in [k for k in self.__keywords if self.__keywords[k] == engine]: + for keyword in [k for k in self.__keywords + if self.__keywords[k] == engine]: del self.__keywords[keyword] del self.__engines[name] - file_ = QDir(self.enginesDirectory()).filePath(self.generateEngineFileName(name)) + file_ = QDir(self.enginesDirectory()).filePath( + self.generateEngineFileName(name)) QFile.remove(file_) if name == self.__current: @@ -375,7 +380,8 @@ @return directory name (string) """ - return os.path.join(Utilities.getConfigDir(), "browser", "searchengines") + return os.path.join( + Utilities.getConfigDir(), "browser", "searchengines") def __confirmAddition(self, engine): """ @@ -391,10 +397,10 @@ res = E5MessageBox.yesNo(None, "", - self.trUtf8("""<p>Do you want to add the following engine to your list of""" - """ search engines?<br/><br/>Name: {0}<br/>""" - """Searches on: {1}</p>""")\ - .format(engine.name(), host)) + self.trUtf8( + """<p>Do you want to add the following engine to your""" + """ list of search engines?<br/><br/>Name: {0}<br/>""" + """Searches on: {1}</p>""").format(engine.name(), host)) return res def __engineFromUrlAvailable(self): @@ -517,6 +523,7 @@ def enginesChanged(self): """ - Public slot to tell the search engine manager, that something has changed. + Public slot to tell the search engine manager, that something has + changed. """ self.changed.emit()