--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py Sun Nov 06 11:22:39 2022 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py Mon Nov 07 17:19:58 2022 +0100 @@ -18,6 +18,7 @@ from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.Utilities.AutoSaver import AutoSaver +from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow class OpenSearchManager(QObject): @@ -170,8 +171,6 @@ if not url.isValid(): return False - from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow - reply = WebBrowserWindow.networkManager().get(QNetworkRequest(url)) reply.finished.connect(lambda: self.__engineFromUrlAvailable(reply)) reply.setParent(self) @@ -187,12 +186,12 @@ (string) @return flag indicating success (boolean) """ + from .OpenSearchReader import OpenSearchReader + file_ = QFile(filename) if not file_.open(QIODevice.OpenModeFlag.ReadOnly): return False - from .OpenSearchReader import OpenSearchReader - reader = OpenSearchReader() engine = reader.read(file_) @@ -235,6 +234,8 @@ @param view reference to the web browser view @type WebBrowserView """ + from .OpenSearchEngine import OpenSearchEngine + if not res: return @@ -277,8 +278,6 @@ actionUrl.setQuery(searchUrlQuery) - from .OpenSearchEngine import OpenSearchEngine - engine = OpenSearchEngine() engine.setName(engineName) engine.setDescription(engineName) @@ -344,13 +343,13 @@ @param dirName name of the directory to write the files to (string) """ + from .OpenSearchWriter import OpenSearchWriter + qdir = QDir() if not qdir.mkpath(dirName): return qdir.setPath(dirName) - from .OpenSearchWriter import OpenSearchWriter - writer = OpenSearchWriter() for engine in list(self.__engines.values()): @@ -475,13 +474,13 @@ @param reply reference to the network reply @type QNetworkReply """ + from .OpenSearchReader import OpenSearchReader + reply.close() if reply in self.__replies: self.__replies.remove(reply) if reply.error() == QNetworkReply.NetworkError.NoError: - from .OpenSearchReader import OpenSearchReader - reader = OpenSearchReader() engine = reader.read(reply) @@ -498,8 +497,6 @@ return else: # some error happened - from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow - WebBrowserWindow.getWindow().statusBar().showMessage( reply.errorString(), 10000 )