diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/UI/Previewers/PreviewerHTML.py --- a/src/eric7/UI/Previewers/PreviewerHTML.py Sun Dec 18 14:19:10 2022 +0100 +++ b/src/eric7/UI/Previewers/PreviewerHTML.py Sun Dec 18 19:33:46 2022 +0100 @@ -29,8 +29,9 @@ QWidget, ) -from eric7 import Preferences, Utilities +from eric7 import Preferences from eric7.EricWidgets.EricApplication import ericApp +from eric7.SystemUtilities import FileSystemUtilities class PreviewerHTML(QWidget): @@ -254,8 +255,8 @@ @param rootPath path of the web site root @type str """ - self.__previewedPath = Utilities.normcasepath( - Utilities.fromNativeSeparators(filePath) + self.__previewedPath = FileSystemUtilities.normcasepath( + FileSystemUtilities.fromNativeSeparators(filePath) ) self.__saveScrollBarPositions() self.previewView.page().loadFinished.connect(self.__restoreScrollBarPositions) @@ -552,9 +553,9 @@ break if incMatch.group(1) == "virtual": - incFile = Utilities.normjoinpath(docRoot, incMatch.group(2)) + incFile = FileSystemUtilities.normjoinpath(docRoot, incMatch.group(2)) elif incMatch.group(1) == "file": - incFile = Utilities.normjoinpath(baseDir, incMatch.group(2)) + incFile = FileSystemUtilities.normjoinpath(baseDir, incMatch.group(2)) else: incFile = "" if os.path.exists(incFile): @@ -585,7 +586,7 @@ if not root: return txt - root = Utilities.fromNativeSeparators(root) + root = FileSystemUtilities.fromNativeSeparators(root) if not root.endswith("/"): root += "/" rootLen = len(root)