diff -r 0b936ff1bbb9 -r a2bc06a54d9d src/eric7/WebBrowser/Bookmarks/BookmarksManager.py --- a/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py Sun Nov 06 11:22:39 2022 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py Mon Nov 07 17:19:58 2022 +0100 @@ -129,6 +129,8 @@ @exception RuntimeError raised to indicate an error loading the bookmarks """ + from .XbelReader import XbelReader + if self.__loaded: return @@ -141,8 +143,6 @@ ) bookmarkFile.open(QIODevice.OpenModeFlag.ReadOnly) - from .XbelReader import XbelReader - reader = XbelReader() self.__bookmarkRootNode = reader.read(bookmarkFile) if reader.error() != QXmlStreamReader.Error.NoError: @@ -199,11 +199,11 @@ """ Public method to save the bookmarks. """ + from .XbelWriter import XbelWriter + if not self.__loaded: return - from .XbelWriter import XbelWriter - writer = XbelWriter() bookmarkFile = self.getFileName() @@ -374,9 +374,9 @@ @return reference to the bookmarks model (BookmarksModel) """ + from .BookmarksModel import BookmarksModel + if self.__bookmarksModel is None: - from .BookmarksModel import BookmarksModel - self.__bookmarksModel = BookmarksModel(self, self) return self.__bookmarksModel @@ -416,11 +416,11 @@ fpath = fpath.with_suffix(ex) if fpath.suffix == ".html": - from .NsHtmlWriter import NsHtmlWriter + from .NsHtmlWriter import NsHtmlWriter # __IGNORE_WARNING_I101__ writer = NsHtmlWriter() else: - from .XbelWriter import XbelWriter + from .XbelWriter import XbelWriter # __IGNORE_WARNING_I101__ writer = XbelWriter() if not writer.write(str(fpath), self.__bookmarkRootNode):