diff -r 0b936ff1bbb9 -r a2bc06a54d9d src/eric7/eric7_ide.py --- a/src/eric7/eric7_ide.py Sun Nov 06 11:22:39 2022 +0100 +++ b/src/eric7/eric7_ide.py Mon Nov 07 17:19:58 2022 +0100 @@ -37,6 +37,7 @@ try: from PyQt6.QtCore import QCoreApplication, QLibraryInfo, QTimer, qWarning + from PyQt6.QtGui import QGuiApplication except ImportError: try: from tkinter import messagebox @@ -86,9 +87,12 @@ ) sys.argv.remove(arg) -# make Third-Party package available as a packages repository +# make Third-Party package 'Jasy' available as a packages repository sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Jasy")) +# make Python debug client available as a package repository (needed for 'coverage') +sys.path.insert(2, os.path.join(os.path.dirname(__file__), "DebugClients", "Python")) + from eric7.EricWidgets.EricApplication import EricApplication @@ -231,8 +235,6 @@ sys.excepthook = excepthook multiprocessing.set_start_method("spawn") - from PyQt6.QtGui import QGuiApplication - QGuiApplication.setDesktopFileName("eric7.desktop") options = [ @@ -282,7 +284,7 @@ pathList.insert(0, exeDir) os.environ["PATH"] = os.pathsep.join(pathList) - from eric7.Toolbox import Startup + from eric7.Toolbox import Startup # __IGNORE_WARNING_I101__ # set the library paths for plugins Startup.setLibraryPaths() @@ -297,7 +299,7 @@ ddindex = Startup.handleArgs(sys.argv, appinfo) logging.debug("Importing Preferences") - from eric7 import Preferences + from eric7 import Preferences # __IGNORE_WARNING_I101__ if Preferences.getUI("SingleApplicationMode"): handleSingleApplication(ddindex) @@ -309,7 +311,10 @@ Startup.initializeResourceSearchPath(app) # generate and show a splash window, if not suppressed - from eric7.UI.SplashScreen import NoneSplashScreen, SplashScreen + from eric7.UI.SplashScreen import ( # __IGNORE_WARNING_I101__ + NoneSplashScreen, + SplashScreen, + ) if "--no-splash" in sys.argv and sys.argv.index("--no-splash") < ddindex: sys.argv.remove("--no-splash") @@ -378,14 +383,14 @@ loc = Startup.loadTranslators(qtTransDir, app, ("qscintilla",)) # Initialize SSL stuff - from eric7.EricNetwork.EricSslUtilities import initSSL + from eric7.EricNetwork.EricSslUtilities import initSSL # __IGNORE_WARNING_I101__ initSSL() splash.showMessage(QCoreApplication.translate("eric7_ide", "Starting...")) # We can only import these after creating the EricApplication because they # make Qt calls that need the EricApplication to exist. - from eric7.UI.UserInterface import UserInterface + from eric7.UI.UserInterface import UserInterface # __IGNORE_WARNING_I101__ splash.showMessage( QCoreApplication.translate("eric7_ide", "Generating Main Window...") @@ -408,7 +413,7 @@ QTimer.singleShot(0, uiStartUp) # generate a graphical error handler - from eric7.EricWidgets import EricErrorMessage + from eric7.EricWidgets import EricErrorMessage # __IGNORE_WARNING_I101__ eMsg = EricErrorMessage.qtHandler() eMsg.setMinimumSize(600, 400)