Mercurial Repositories > eric / changeset
changeset
Merged with changes made by Tobias.
Tue, 25 Oct 2016 19:33:43 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 25 Oct 2016 19:33:43 +0200
- changeset 5271
- ac9d134b457a
- parent 5270
- 7758f0c7d9f6 (current diff)
- parent 5269
- 0e96e1557c45 (diff)
- child 5272
- 5684dd6667e6
Merged with changes made by Tobias.
--- a/DebugClients/Python/ThreadExtension.py Tue Oct 25 19:33:11 2016 +0200 +++ b/DebugClients/Python/ThreadExtension.py Tue Oct 25 19:33:43 2016 +0200 @@ -233,7 +233,8 @@ self.threads[id] = newThread # adjust current frame - self.threads[id].currentFrame = self.getExecutedFrame(frame) + if "__pypy__" not in sys.builtin_module_names: + self.threads[id].currentFrame = self.getExecutedFrame(frame) # Clean up obsolet because terminated threads self.threads = {id_: thrd for id_, thrd in self.threads.items()
--- a/Debugger/DebuggerInterfacePython2.py Tue Oct 25 19:33:11 2016 +0200 +++ b/Debugger/DebuggerInterfacePython2.py Tue Oct 25 19:33:43 2016 +0200 @@ -869,6 +869,11 @@ self.debugServer.signalClientOutput(params["text"]) elif method in ["ResponseLine", "ResponseStack"]: + # Check if obsolet thread was clicked + if params["stack"] == []: + # Request updated list + self.remoteThreadList() + return for s in params["stack"]: s[0] = self.translate(s[0], True) cf = params["stack"][0]
--- a/Debugger/DebuggerInterfacePython3.py Tue Oct 25 19:33:11 2016 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Tue Oct 25 19:33:43 2016 +0200 @@ -869,6 +869,11 @@ self.debugServer.signalClientOutput(params["text"]) elif method in ["ResponseLine", "ResponseStack"]: + # Check if obsolet thread was clicked + if params["stack"] == []: + # Request updated list + self.remoteThreadList() + return for s in params["stack"]: s[0] = self.translate(s[0], True) cf = params["stack"][0]
