diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Testing/TestingWidget.py --- a/src/eric7/Testing/TestingWidget.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Testing/TestingWidget.py Tue Oct 18 16:06:21 2022 +0200 @@ -15,10 +15,10 @@ from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QCoreApplication from PyQt6.QtWidgets import QAbstractButton, QComboBox, QDialogButtonBox, QWidget -from EricWidgets import EricMessageBox -from EricWidgets.EricApplication import ericApp -from EricWidgets.EricMainWindow import EricMainWindow -from EricWidgets.EricPathPicker import EricPathPickerModes +from eric7.EricWidgets import EricMessageBox +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricMainWindow import EricMainWindow +from eric7.EricWidgets.EricPathPicker import EricPathPickerModes from .Ui_TestingWidget import Ui_TestingWidget @@ -27,10 +27,10 @@ from .Interfaces.TestExecutorBase import TestConfig, TestResult, TestResultCategory from .Interfaces.TestFrameworkRegistry import TestFrameworkRegistry -import Preferences -import UI.PixmapCache +from eric7 import Preferences +from eric7.EricGui import EricPixmapCache -from Globals import ( +from eric7.Globals import ( recentNameTestDiscoverHistory, recentNameTestFileHistory, recentNameTestNameHistory, @@ -80,9 +80,9 @@ self.__resultsTree.goto.connect(self.__showSource) self.resultsGroupBox.layout().addWidget(self.__resultsTree) - self.versionsButton.setIcon(UI.PixmapCache.getIcon("info")) - self.clearHistoriesButton.setIcon(UI.PixmapCache.getIcon("clearPrivateData")) - self.showMarkersButton.setIcon(UI.PixmapCache.getIcon("select")) + self.versionsButton.setIcon(EricPixmapCache.getIcon("info")) + self.clearHistoriesButton.setIcon(EricPixmapCache.getIcon("clearPrivateData")) + self.showMarkersButton.setIcon(EricPixmapCache.getIcon("select")) self.testsuitePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) self.testsuitePicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop) @@ -165,7 +165,7 @@ self.setWindowFlags( self.windowFlags() | Qt.WindowType.WindowContextHelpButtonHint ) - self.setWindowIcon(UI.PixmapCache.getIcon("eric")) + self.setWindowIcon(EricPixmapCache.getIcon("eric")) self.setWindowTitle(self.tr("Testing")) try: @@ -177,7 +177,7 @@ self.__projectEnvironmentMarker = self.tr("<project>") except KeyError: # we were called as a standalone application - from VirtualEnv.VirtualenvManager import VirtualenvManager + from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager self.__venvManager = VirtualenvManager(self) self.__venvManager.virtualEnvironmentAdded.connect( @@ -1094,7 +1094,7 @@ run. """ if self.__coverageDialog is None: - from DataViews.PyCoverageDialog import PyCoverageDialog + from eric7.DataViews.PyCoverageDialog import PyCoverageDialog self.__coverageDialog = PyCoverageDialog(self) self.__coverageDialog.openFile.connect(self.__openEditor) @@ -1113,7 +1113,7 @@ """ Private slot to show the output of the most recent test run. """ - from EricWidgets.EricPlainTextDialog import EricPlainTextDialog + from eric7.EricWidgets.EricPlainTextDialog import EricPlainTextDialog dlg = EricPlainTextDialog( title=self.tr("Test Run Output"), text=self.__recentLog @@ -1180,7 +1180,7 @@ @param linenumber line number to place the cursor at (defaults to 1) @type int (optional) """ - from QScintilla.MiniEditor import MiniEditor + from eric7.QScintilla.MiniEditor import MiniEditor editor = MiniEditor(filename, "Python3", self) editor.gotoLine(linenumber)