--- a/src/eric7/Testing/TestingWidget.py Mon Oct 31 14:07:57 2022 +0100 +++ b/src/eric7/Testing/TestingWidget.py Wed Nov 30 09:19:51 2022 +0100 @@ -12,31 +12,29 @@ import locale import os -from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QCoreApplication +from PyQt6.QtCore import QCoreApplication, QEvent, Qt, pyqtSignal, pyqtSlot from PyQt6.QtWidgets import QAbstractButton, QComboBox, QDialogButtonBox, QWidget +from eric7 import Preferences +from eric7.DataViews.PyCoverageDialog import PyCoverageDialog +from eric7.EricGui import EricPixmapCache from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricMainWindow import EricMainWindow from eric7.EricWidgets.EricPathPicker import EricPathPickerModes +from eric7.Globals import ( + recentNameTestDiscoverHistory, + recentNameTestEnvironment, + recentNameTestFileHistory, + recentNameTestFramework, + recentNameTestNameHistory, +) -from .Ui_TestingWidget import Ui_TestingWidget - -from .TestResultsTree import TestResultsModel, TestResultsTreeView from .Interfaces import Frameworks from .Interfaces.TestExecutorBase import TestConfig, TestResult, TestResultCategory from .Interfaces.TestFrameworkRegistry import TestFrameworkRegistry - -from eric7 import Preferences -from eric7.EricGui import EricPixmapCache - -from eric7.Globals import ( - recentNameTestDiscoverHistory, - recentNameTestFileHistory, - recentNameTestNameHistory, - recentNameTestFramework, - recentNameTestEnvironment, -) +from .TestResultsTree import TestResultsModel, TestResultsTreeView +from .Ui_TestingWidget import Ui_TestingWidget class TestingWidgetModes(enum.Enum): @@ -177,7 +175,9 @@ self.__projectEnvironmentMarker = self.tr("<project>") except KeyError: # we were called as a standalone application - from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager + from eric7.VirtualEnv.VirtualenvManager import ( # __IGNORE_WARNING_I101__ + VirtualenvManager, + ) self.__venvManager = VirtualenvManager(self) self.__venvManager.virtualEnvironmentAdded.connect( @@ -754,6 +754,8 @@ """ Private slot to show a window containing the list of defined markers. """ + from .MarkersWindow import MarkersWindow + venvName = self.venvComboBox.currentText() if venvName: framework = self.frameworkComboBox.currentText() @@ -770,8 +772,6 @@ markers = executor.getMarkers(interpreter, workdir) if self.__markersWindow is None: - from .MarkersWindow import MarkersWindow - self.__markersWindow = MarkersWindow() self.__markersWindow.showMarkers(markers) @@ -1094,8 +1094,6 @@ run. """ if self.__coverageDialog is None: - from eric7.DataViews.PyCoverageDialog import PyCoverageDialog - self.__coverageDialog = PyCoverageDialog(self) self.__coverageDialog.openFile.connect(self.__openEditor) @@ -1198,7 +1196,7 @@ event.accept() for editor in self.__editors: - with contextlib.suppress(Exception): + with contextlib.suppress(RuntimeError): editor.close()