diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-08-16 09:02:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 09:02:08 (GMT) |
| commit | 98e26979aa4c15b391fd3780340772a17d513d4d (patch) | |
| tree | ccaf08b891aaa8f7275db8350cd86851c55d9a27 | |
| parent | de36ba065e933648f5687998021175cf21d4564b (diff) | |
| download | cpython-98e26979aa4c15b391fd3780340772a17d513d4d.zip cpython-98e26979aa4c15b391fd3780340772a17d513d4d.tar.gz cpython-98e26979aa4c15b391fd3780340772a17d513d4d.tar.bz2 | |
Revert "[3.6] bpo-30983: eval frame rename in pep 0523 broke gdb's python extension (GH-2803) (#3090)" (#3101)
This reverts commit 09b77165e3fffa7b7ff160ad06042cdcfa004bf5.
| -rw-r--r-- | Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst | 4 | ||||
| -rwxr-xr-x | Tools/gdb/libpython.py | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst b/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst deleted file mode 100644 index 44c5e1c..0000000 --- a/Misc/NEWS.d/next/Tools-Demos/2017-08-14-15-37-38.bpo-30983.A7UzX8.rst +++ /dev/null @@ -1,4 +0,0 @@ -With PEP 523, gdb's Python integration stopped working properly for frames -using the ``_PyEval_EvalFrameDefault`` function. Affected functionality -included `py-list` and `py-bt`. This is now fixed. Patch by Bruno "Polaco" -Penteado. diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index 40e0a67..31ae811 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 |