Mercurial Repositories > eric / file diff

--- a/DebugClients/Python3/DebugBase.py	Thu Sep 01 20:03:50 2016 +0200
+++ b/DebugClients/Python3/DebugBase.py	Fri Sep 02 19:14:41 2016 +0200
@@ -246,7 +246,8 @@
             return self.trace_dispatch
         if event == 'c_return':
             return self.trace_dispatch
-        print('DebugBase.trace_dispatch: unknown debugging event: ',       # __IGNORE_WARNING__
+        print('DebugBase.trace_dispatch:'       # __IGNORE_WARNING__
+              ' unknown debugging event: ',
               repr(event))
         return self.trace_dispatch
 
@@ -707,16 +708,17 @@
             atexit._run_exitfuncs()
             if excval is None:
                 excval = 0
+                message = ""
             elif isinstance(excval, str):
-                self._dbgClient.write(excval)
                 excval = 1
+                message = excval
             elif isinstance(excval, bytes):
-                self._dbgClient.write(excval.decode())
                 excval = 1
+                message = excval.decode()
             if isinstance(excval, int):
-                self._dbgClient.progTerminated(excval)
+                self._dbgClient.progTerminated(excval, message)
             else:
-                self._dbgClient.progTerminated(excval.code)
+                self._dbgClient.progTerminated(excval.code, "")
             return
         
         if exctype in [SyntaxError, IndentationError]:
@@ -869,12 +871,13 @@
         #debugging the debugger - when the debugger code is in the current
         #directory.
         if os.path.basename(fn) in [
-            'AsyncFile.py', 'AsyncIO.py',
-            'DebugConfig.py', 'DCTestResult.py',
-            'DebugBase.py', 'DebugClientBase.py',
-            'DebugClientCapabilities.py', 'DebugClient.py',
-            'DebugClientThreads.py', 'DebugProtocol.py',
-            'DebugThread.py', 'FlexCompleter.py',
+            'AsyncFile.py', 'DCTestResult.py',
+            'DebugBase.py', 'DebugClient.py',
+            'DebugClientBase.py',
+            'DebugClientCapabilities.py',
+            'DebugClientThreads.py',
+            'DebugConfig.py', 'DebugThread.py',
+            'DebugUtilities.py', 'FlexCompleter.py',
             'PyProfile.py'] or \
            os.path.dirname(fn).endswith("coverage"):
             return True