diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-08-16 09:02:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 09:02:05 (GMT) |
| commit | 7cc33998b83df6ab8cf2c1afe16a61ee232e39ec (patch) | |
| tree | c6e4752d516307af3a78602d67ad962fef7500ed | |
| parent | 7f066844a79ea201a28b9555baf4bceded90484f (diff) | |
| download | cpython-7cc33998b83df6ab8cf2c1afe16a61ee232e39ec.zip cpython-7cc33998b83df6ab8cf2c1afe16a61ee232e39ec.tar.gz cpython-7cc33998b83df6ab8cf2c1afe16a61ee232e39ec.tar.bz2 | |
bpo-30983: Revert changes which broke most buildbots (#3100)
* Revert "Add Bruno Penteado to ACKS (#3091)"
This reverts commit f978405b3f092e4005b92ba1dbaab15f609b3bb0.
* Revert "bpo-30983: eval frame rename in pep 0523 broke gdb's python extension (#2803)"
This reverts commit 2e0f4db114424a00354eab889ba8f7334a2ab8f0.
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rwxr-xr-x | Tools/gdb/libpython.py | 6 |
2 files changed, 2 insertions, 5 deletions
@@ -1184,7 +1184,6 @@ Berker Peksag Andreas Pelme Steven Pemberton Bo Peng -Bruno "Polaco" Penteado Santiago Peresón George Peristerakis Thomas Perl diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index 7c8874a..cc23b84 100755 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -1502,10 +1502,8 @@ class Frame(object): return False def is_evalframeex(self): - '''Is this a PyEval_EvalFrameEx or _PyEval_EvalFrameDefault (PEP 0523) - frame?''' - if self._gdbframe.name() in ('PyEval_EvalFrameEx', - '_PyEval_EvalFrameDefault'): + '''Is this a PyEval_EvalFrameEx frame?''' + if self._gdbframe.name() == 'PyEval_EvalFrameEx': ''' I believe we also need to filter on the inline struct frame_id.inline_depth, only regarding frames with |