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.

diff --git a/Misc/ACKS b/Misc/ACKS
index c55d09ac67c8e13c481c5d7df237d35e76aab220..6fc41b36b597106e27c000e8e55f85b9ce5ddb56 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -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 7c8874a7acea2c02d302a700978ddb89c6096261..cc23b8402df9d5586837290e7691bc82a78ab49d 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