Mercurial Repositories > eric / file diff

--- a/eric6/Debugger/DebugUI.py	Sun Jul 05 11:11:24 2020 +0200
+++ b/eric6/Debugger/DebugUI.py	Sun Oct 18 12:35:30 2020 +0200
@@ -7,7 +7,6 @@
 Module implementing the debugger UI.
 """
 
-
 import os
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, Qt
@@ -1250,6 +1249,7 @@
                     stack.append((fn, ln, func, args))
                 self.clientStack.emit(stack, debuggerId)
                 self.__getClientVariables(debuggerId)
+                self.__getClientDisassembly(debuggerId)
                 self.ui.setDebugProfile()
                 self.debugActGrp.setEnabled(True)
                 return
@@ -1387,7 +1387,16 @@
                 self.debugViewer.showVariable(variables, True)
             elif scope == 0:
                 self.debugViewer.showVariable(variables, False)
-            
+    
+    def __getClientDisassembly(self, debuggerId):
+        """
+        Private method to ask the client for the latest traceback disassembly.
+        
+        @param debuggerId ID of the debugger backend
+        @type str
+        """
+        self.debugServer.remoteClientDisassembly(debuggerId)
+    
     def __clientBreakConditionError(self, filename, lineno, debuggerId):
         """
         Private method to handle a condition error of a breakpoint.
@@ -1422,7 +1431,7 @@
         dlg = EditBreakpointDialog(
             (fn, line), (cond, temp, enabled, count),
             [], self.ui, modal=True)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             cond, temp, enabled, count = dlg.getData()
             model.setBreakPointByIndex(index, fn, line,
                                        (cond, temp, enabled, count))
@@ -1459,7 +1468,7 @@
         from .EditWatchpointDialog import EditWatchpointDialog
         dlg = EditWatchpointDialog(
             (cond, temp, enabled, count, special), self.ui)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             cond, temp, enabled, count, special = dlg.getData()
             
             # check for duplicates
@@ -1494,7 +1503,7 @@
         from .VariablesFilterDialog import VariablesFilterDialog
         dlg = VariablesFilterDialog(self.ui, 'Filter Dialog', True)
         dlg.setSelection(self.localsVarFilter, self.globalsVarFilter)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.localsVarFilter, self.globalsVarFilter = dlg.getSelection()
             self.debugViewer.setVariablesFilter(
                 self.globalsVarFilter, self.localsVarFilter)
@@ -1505,7 +1514,7 @@
         """
         from .ExceptionsFilterDialog import ExceptionsFilterDialog
         dlg = ExceptionsFilterDialog(self.excList, ignore=False)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.excList = dlg.getExceptionsList()[:]   # keep a copy
         
     def __configureIgnoredExceptions(self):
@@ -1514,7 +1523,7 @@
         """
         from .ExceptionsFilterDialog import ExceptionsFilterDialog
         dlg = ExceptionsFilterDialog(self.excIgnoreList, ignore=True)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.excIgnoreList = dlg.getExceptionsList()[:]   # keep a copy
         
     def __toggleBreakpoint(self):
@@ -1636,7 +1645,7 @@
             cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
             self.envHistory, self.exceptions, self.ui, 2,
             autoClearShell=self.autoClearShell)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             eraseCoverage = dlg.getCoverageData()
@@ -1772,7 +1781,7 @@
             cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
             self.envHistory, self.exceptions, self.ui, 3,
             autoClearShell=self.autoClearShell)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             eraseTimings = dlg.getProfilingData()
@@ -1910,7 +1919,7 @@
             autoClearShell=self.autoClearShell,
             autoFork=self.forkAutomatically,
             forkChild=self.forkIntoChild)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             forkAutomatically, forkIntoChild = dlg.getRunData()
@@ -2052,7 +2061,7 @@
             forkChild=self.forkIntoChild,
             enableMultiprocess=self.enableMultiprocess,
             multiprocessNoDebugHistory=self.multiprocessNoDebugHistory)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
              console) = dlg.getData()
             (tracePython, autoContinue, forkAutomatically, forkIntoChild,