Mercurial Repositories > eric / changeset

--- a/DebugClients/Python2/DebugClientBase.py	Sun Sep 11 13:11:58 2016 +0200
+++ b/DebugClients/Python2/DebugClientBase.py	Sun Sep 11 16:39:30 2016 +0200
@@ -392,7 +392,7 @@
         
         try:
             commandDict = json.loads(jsonStr.strip())
-        except json.JSONDecodeError as err:
+        except (TypeError, ValueError) as err:
             printerr(str(err))
             return
         

--- a/DebugClients/Python3/DebugClientBase.py	Sun Sep 11 13:11:58 2016 +0200
+++ b/DebugClients/Python3/DebugClientBase.py	Sun Sep 11 16:39:30 2016 +0200
@@ -386,7 +386,7 @@
         
         try:
             commandDict = json.loads(jsonStr.strip())
-        except json.JSONDecodeError as err:
+        except (TypeError, ValueError) as err:
             printerr(str(err))
             return
         

--- a/DebugClients/Python3/DebugClientThreads.py	Sun Sep 11 13:11:58 2016 +0200
+++ b/DebugClients/Python3/DebugClientThreads.py	Sun Sep 11 16:39:30 2016 +0200
@@ -154,7 +154,7 @@
         """
         try:
             self.lockClient()
-            if id is None:
+            if id is None or id not in self.threads:
                 self.currentThread = None
             else:
                 self.currentThread = self.threads[id]

--- a/Debugger/DebuggerInterfacePython2.py	Sun Sep 11 13:11:58 2016 +0200
+++ b/Debugger/DebuggerInterfacePython2.py	Sun Sep 11 16:39:30 2016 +0200
@@ -851,7 +851,7 @@
         
         try:
             commandDict = json.loads(jsonStr.strip())
-        except json.JSONDecodeError as err:
+        except (TypeError, ValueError) as err:
             E5MessageBox.critical(
                 None,
                 self.tr("Debug Protocol Error"),

--- a/Debugger/DebuggerInterfacePython3.py	Sun Sep 11 13:11:58 2016 +0200
+++ b/Debugger/DebuggerInterfacePython3.py	Sun Sep 11 16:39:30 2016 +0200
@@ -851,7 +851,7 @@
         
         try:
             commandDict = json.loads(jsonStr.strip())
-        except json.JSONDecodeError as err:
+        except (TypeError, ValueError) as err:
             E5MessageBox.critical(
                 None,
                 self.tr("Debug Protocol Error"),