Mercurial Repositories > eric / file diff

--- a/DebugClients/Python3/DebugClientBase.py	Fri Sep 02 19:08:02 2016 +0200
+++ b/DebugClients/Python3/DebugClientBase.py	Sat Sep 03 18:01:19 2016 +0200
@@ -722,9 +722,8 @@
                             if tlist:
                                 tlist.insert(
                                     0, "Traceback (innermost last):\n")
-                                tlist[len(tlist):] = \
-                                    traceback.format_exception_only(
-                                        exc_type, exc_value)
+                                tlist.extend(traceback.format_exception_only(
+                                    exc_type, exc_value))
                         finally:
                             tblist = exc_tb = None
 
@@ -823,7 +822,6 @@
             wp = self.mainThread.get_watch(params["condition"])
             if wp is not None:
                 wp.ignore = params["count"]
-            return
         
         elif method == "RequestShutdown":
             self.sessionClose()
@@ -832,6 +830,10 @@
             self.__completionList(params["text"])
         
         elif method == "RequestUTPrepare":
+            sys.path.insert(
+                0, os.path.dirname(os.path.abspath(params["filename"])))
+            os.chdir(sys.path[0])
+            
             # set the system exception handling function to ensure, that
             # we report on all unhandled exceptions
             sys.excepthook = self.__unhandled_exception
@@ -1345,11 +1347,9 @@
         """
         if status is None:
             status = 0
-        else:
-            try:
-                int(status)
-            except ValueError:
-                status = 1
+        elif not isinstance(status, int):
+            message = str(status)
+            status = 1
 
         if self.running:
             self.set_quit()