Mercurial Repositories > eric / changeset
changeset
Merged with patches created by Tobias.
Sun, 17 Jan 2016 15:15:15 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 17 Jan 2016 15:15:15 +0100
- changeset 4684
- ff9bce0e0424
- parent 4682
- a2f30c80f66c (current diff)
- parent 4683
- 1ba6ba86b383 (diff)
- child 4686
- 5f8a5c568230
Merged with patches created by Tobias.
--- a/DebugClients/Python/DebugBase.py Sun Jan 17 15:12:48 2016 +0100 +++ b/DebugClients/Python/DebugBase.py Sun Jan 17 15:15:15 2016 +0100 @@ -610,7 +610,11 @@ if self._dbgClient.mainFrame is None: if fn != self._dbgClient.getRunning(): return - self._dbgClient.mainFrame = frame + fr = frame + while (fr is not None and + fr.f_code != self._dbgClient.handleLine.func_code): + self._dbgClient.mainFrame = fr + fr = fr.f_back self.currentFrame = frame
--- a/DebugClients/Python3/DebugBase.py Sun Jan 17 15:12:48 2016 +0100 +++ b/DebugClients/Python3/DebugBase.py Sun Jan 17 15:15:15 2016 +0100 @@ -642,7 +642,11 @@ if self._dbgClient.mainFrame is None: if fn != self._dbgClient.getRunning(): return - self._dbgClient.mainFrame = frame + fr = frame + while (fr is not None and + fr.f_code != self._dbgClient.handleLine.__code__): + self._dbgClient.mainFrame = fr + fr = fr.f_back self.currentFrame = frame
