Sat, 05 Dec 2020 18:25:31 +0100
Fixed a few issues introduced by the recent merge and some code style issues.
--- a/eric6/DebugClients/Python/DebugClientBase.py Sat Dec 05 18:13:05 2020 +0100 +++ b/eric6/DebugClients/Python/DebugClientBase.py Sat Dec 05 18:25:31 2020 +0100 @@ -195,7 +195,6 @@ self.callTraceEnabled = None - self.compile_command = codeop.CommandCompiler() self.coding_re = re.compile(r"coding[:=]\s*([-\w_.]+)")
--- a/eric6/Debugger/DebugUI.py Sat Dec 05 18:13:05 2020 +0100 +++ b/eric6/Debugger/DebugUI.py Sat Dec 05 18:25:31 2020 +0100 @@ -1059,16 +1059,17 @@ info = "" if program is None: E5MessageBox.information( - self.ui, Program, self.tr( - '<p>The program has terminated with an exit' - ' status of {0}.</p>{1}').format(status, info) + self.ui, Program, + self.tr('<p>The program has terminated with an exit' + ' status of {0}.</p>{1}').format(status, info) ) else: E5MessageBox.information( - self.ui, Program, self.tr( - '<p><b>{0}</b> has terminated with an exit' - ' status of {1}.</p>{2}').format( - .format(os.path.abspath(self.ui.currentProg), + self.ui, Program, + self.tr('<p><b>{0}</b> has terminated with an exit' + ' status of {1}.</p>{2}').format( + os.path.abspath(self.ui.currentProg), + status, info) ) else: if message: @@ -1099,7 +1100,8 @@ self.appendStdout.emit(self.tr( '"{0}" has terminated with an exit status of' ' {1}.\n{2}\n').format( - os.path.abspath(self.ui.currentProg), status, + os.path.abspath(self.ui.currentProg), + status, info) ) def __lastClientExited(self):
--- a/eric6/Debugger/StartDialog.py Sat Dec 05 18:13:05 2020 +0100 +++ b/eric6/Debugger/StartDialog.py Sat Dec 05 18:25:31 2020 +0100 @@ -320,13 +320,13 @@ from .StartHistoryEditDialog import StartHistoryEditDialog dlg = StartHistoryEditDialog(history, self) if dlg.exec() == QDialog.Accepted: - history = dlg.getHistory() - combo = combos[historiesIndex] - if combo: - combo.clear() - combo.addItems(history) - - self.__historiesModified = True + history = dlg.getHistory() + combo = combos[historiesIndex] + if combo: + combo.clear() + combo.addItems(history) + + self.__historiesModified = True def historiesModified(self): """