Mercurial Repositories > eric / changeset

--- a/DebugClients/Python/DebugClientBase.py	Sun Jul 20 17:54:27 2014 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Thu Jul 24 22:34:05 2014 +0200
@@ -203,6 +203,7 @@
         
         # The context to run the debugged program in.
         self.debugMod = imp.new_module('__main__')
+        self.debugMod.__dict__['__builtins__'] = __builtins__
 
         # The list of complete lines to execute.
         self.buffer = ''
@@ -1284,9 +1285,11 @@
             frmnr -= 1
         
         if f is None:
-            return
-        
-        if scope:
+            if scope:
+                dict = self.debugMod.__dict__
+            else:
+                scope = -1
+        elif scope:
             dict = f.f_globals
         else:
             dict = f.f_locals
@@ -1327,9 +1330,11 @@
             frmnr -= 1
         
         if f is None:
-            return
-        
-        if scope:
+            if scope:
+                dict = self.debugMod.__dict__
+            else:
+                scope = -1
+        elif scope:
             dict = f.f_globals
         else:
             dict = f.f_locals

--- a/DebugClients/Python3/DebugClientBase.py	Sun Jul 20 17:54:27 2014 +0200
+++ b/DebugClients/Python3/DebugClientBase.py	Thu Jul 24 22:34:05 2014 +0200
@@ -177,6 +177,7 @@
         
         # The context to run the debugged program in.
         self.debugMod = imp.new_module('__main__')
+        self.debugMod.__dict__['__builtins__'] = __builtins__
 
         # The list of complete lines to execute.
         self.buffer = ''
@@ -1295,9 +1296,11 @@
             frmnr -= 1
         
         if f is None:
-            return
-        
-        if scope:
+            if scope:
+                dict = self.debugMod.__dict__
+            else:
+                scope = -1
+        elif scope:
             dict = f.f_globals
         else:
             dict = f.f_locals
@@ -1338,9 +1341,11 @@
             frmnr -= 1
         
         if f is None:
-            return
-        
-        if scope:
+            if scope:
+                dict = self.debugMod.__dict__
+            else:
+                scope = -1
+        elif scope:
             dict = f.f_globals
         else:
             dict = f.f_locals

--- a/Debugger/DebugServer.py	Sun Jul 20 17:54:27 2014 +0200
+++ b/Debugger/DebugServer.py	Thu Jul 24 22:34:05 2014 +0200
@@ -440,6 +440,8 @@
                 elif self.__autoClearShell:
                     self.__autoClearShell = False
                     self.remoteBanner()
+                self.remoteClientVariables(0, [], 0)
+                self.remoteClientVariables(1, [], 0)
             else:
                 if clType and self.lastClientType:
                     self.__setClientType(self.lastClientType)

--- a/Debugger/DebugViewer.py	Sun Jul 20 17:54:27 2014 +0200
+++ b/Debugger/DebugViewer.py	Thu Jul 24 22:34:05 2014 +0200
@@ -255,7 +255,7 @@
             if self.embeddedBrowser:
                 self.__tabWidget.setCurrentWidget(self.browser)
             else:
-                self.__tabWidget.setCurrentWidget(self.lvWidget)
+                self.__tabWidget.setCurrentWidget(self.glvWidget)
         
         # add the threads viewer
         self.__mainLayout.addWidget(QLabel(self.tr("Threads:")))
@@ -305,6 +305,8 @@
         """
         self.globalsViewer.handleResetUI()
         self.localsViewer.handleResetUI()
+        self.__setGlobalsFilter()
+        self.__setLocalsFilter()        
         self.sourceButton.setEnabled(False)
         self.currentStack = None
         self.stackComboBox.clear()
@@ -315,7 +317,7 @@
             if self.embeddedBrowser:
                 self.__tabWidget.setCurrentWidget(self.browser)
             else:
-                self.__tabWidget.setCurrentWidget(self.lvWidget)
+                self.__tabWidget.setCurrentWidget(self.glvWidget)
         self.breakpointViewer.handleResetUI()
         
     def handleRawInput(self):
@@ -465,8 +467,7 @@
         """
         filter = self.globalsFilterEdit.text()
         self.debugServer.remoteClientSetFilter(1, filter)
-        if self.currentStack:
-            self.debugServer.remoteClientVariables(2, self.globalsFilter)
+        self.debugServer.remoteClientVariables(2, self.globalsFilter)
         
     def __setLocalsFilter(self):
         """