--- a/src/eric7/eric7_browser.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/eric7_browser.py Tue Oct 18 16:06:21 2022 +0200 @@ -15,14 +15,13 @@ import sys import os -sys.path.insert(1, os.path.dirname(__file__)) - app = None SettingsDir = None +from eric7 import Globals + for arg in sys.argv[:]: if arg.startswith("--config="): - import Globals configDir = arg.replace("--config=", "") Globals.setConfigDir(configDir) @@ -44,7 +43,7 @@ if "--quiet" not in sys.argv: from PyQt6.QtCore import QTimer from PyQt6.QtWidgets import QApplication - from EricWidgets import EricMessageBox # __IGNORE_WARNING__ + from eric7.EricWidgets import EricMessageBox # __IGNORE_WARNING__ app = QApplication([]) QTimer.singleShot( @@ -61,14 +60,15 @@ from PyQt6.QtWebEngineCore import QWebEngineUrlScheme -import Globals -from Globals import AppInfo +from eric7.Globals import AppInfo + +from eric7.EricWidgets.EricApplication import EricApplication -from EricWidgets.EricApplication import EricApplication +from eric7.Toolbox import Startup -from Toolbox import Startup - -from WebBrowser.WebBrowserSingleApplication import WebBrowserSingleApplicationClient +from eric7.WebBrowser.WebBrowserSingleApplication import ( + WebBrowserSingleApplicationClient, +) def createMainWidget(argv): @@ -80,7 +80,7 @@ @return reference to the main widget @rtype QWidget """ - from WebBrowser.WebBrowserWindow import WebBrowserWindow + from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow searchWord = None private = False