Revert "[3.6] bpo-30983: eval frame rename in pep 0523 broke gdb's python extension...

This reverts commit 09b77165e3fffa7b7ff160ad06042cdcfa004bf5.

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 (file)
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 40e0a677cd0545487130ccbebd24ed486111d362..31ae8117c785ff466db1a7f1624ccccc404c6853 100755 (executable)
--- 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