diff -r 8d3ae97ee666 -r d88e53da6e66 eric7/UI/UserInterface.py --- a/eric7/UI/UserInterface.py Wed May 18 08:43:36 2022 +0200 +++ b/eric7/UI/UserInterface.py Wed May 18 09:19:09 2022 +0200 @@ -661,9 +661,9 @@ # Initialize the instance variables. self.currentProg = None self.isProg = False - # TODO: rename/eliminate/rework these two related to unittest - self.utEditorOpen = False - self.utProjectOpen = False + # TODO: eliminate/rework these two related to testing + self.__testingEditorOpen = False + self.__testingProjectOpen = False self.inDragDrop = False self.setAcceptDrops(True) @@ -6863,7 +6863,7 @@ cap = self.__debugServer.getClientCapabilities( self.project.getProjectLanguage()) self.testProjectAct.setEnabled(cap & HasUnittest) - self.utProjectOpen = cap & HasUnittest + self.__testingProjectOpen = cap & HasUnittest def __projectClosed(self): """ @@ -6871,10 +6871,10 @@ """ self.__setWindowCaption(project="") self.testProjectAct.setEnabled(False) - if not self.utEditorOpen: + if not self.__testingEditorOpen: self.restartTestAct.setEnabled(False) self.rerunFailedTestsAct.setEnabled(False) - self.utProjectOpen = False + self.__testingProjectOpen = False def __programChange(self, fn): """ @@ -6896,8 +6896,8 @@ """ self.wizardsMenuAct.setEnabled(False) self.testScriptAct.setEnabled(False) - self.utEditorOpen = False - if not self.utProjectOpen: + self.__testingEditorOpen = False + if not self.__testingProjectOpen: self.restartTestAct.setEnabled(False) self.rerunFailedTestsAct.setEnabled(False) self.__setWindowCaption(editor="") @@ -6919,12 +6919,12 @@ from Debugger.DebugClientCapabilities import HasUnittest cap = dbs.getClientCapabilities(language) self.testScriptAct.setEnabled(cap & HasUnittest) - self.utEditorOpen = cap & HasUnittest + self.__testingEditorOpen = cap & HasUnittest return if self.viewmanager.getOpenEditor(fn).isPyFile(): self.testScriptAct.setEnabled(True) - self.utEditorOpen = True + self.__testingEditorOpen = True def __checkActions(self, editor): """ @@ -6942,12 +6942,12 @@ from Debugger.DebugClientCapabilities import HasUnittest cap = dbs.getClientCapabilities(language) self.testScriptAct.setEnabled(cap & HasUnittest) - self.utEditorOpen = cap & HasUnittest + self.__testingEditorOpen = cap & HasUnittest return if editor.isPyFile(): self.testScriptAct.setEnabled(True) - self.utEditorOpen = True + self.__testingEditorOpen = True return self.testScriptAct.setEnabled(False)