--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py Sun Dec 18 14:19:10 2022 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py Sun Dec 18 19:33:46 2022 +0100 @@ -12,8 +12,8 @@ from PyQt6.QtCore import QCoreApplication, QDate, Qt -from eric7 import Globals from eric7.EricGui import EricPixmapCache +from eric7.SystemUtilities import OSUtilities from .BookmarksImporter import BookmarksImporter @@ -33,11 +33,11 @@ raise ValueError("Unsupported browser ID given ({0}).".format(sourceId)) if sourceId == "chrome": - if Globals.isWindowsPlatform(): + if OSUtilities.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\User Data\\Default" ) - elif Globals.isMacPlatform(): + elif OSUtilities.isMacPlatform(): standardDir = os.path.expanduser( "~/Library/Application Support/Google/Chrome/Default" ) @@ -61,7 +61,7 @@ ) elif sourceId == "chromium": - if Globals.isWindowsPlatform(): + if OSUtilities.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\User Data\\Default" ) @@ -84,7 +84,7 @@ ) elif sourceId == "edge": - if Globals.isWindowsPlatform(): + if OSUtilities.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Local\\Microsoft\\Edge\\User Data\\Default" ) @@ -108,7 +108,7 @@ ) elif sourceId == "falkon": - if Globals.isWindowsPlatform(): + if OSUtilities.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Local\\falkon\\profiles\\default" ) @@ -132,7 +132,7 @@ ) elif sourceId == "opera": - if Globals.isWindowsPlatform(): + if OSUtilities.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Roaming\\Opera Software\\Opera Stable" ) @@ -156,7 +156,7 @@ ) elif sourceId == "vivaldi": - if Globals.isWindowsPlatform(): + if OSUtilities.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Local\\Vivaldi\\User Data\\Default" ) @@ -182,7 +182,7 @@ # entry if an unknown source is given standardDir = ( os.path.expandvars("%USERPROFILE%\\AppData") - if Globals.isWindowsPlatform() + if OSUtilities.isWindowsPlatform() else os.path.expanduser("~/.config") ) return (