Backout c89febab4648 following private feedback by Guido.

(Issue #17807: Generators can now be finalized even when they are part of a reference cycle)

2 files changed, 0 insertions, 10 deletions

diff --git a/Include/frameobject.h b/Include/frameobject.h
index 0e7f32b42a..33f73af52a 100644
--- a/Include/frameobject.h
+++ b/Include/frameobject.h
@@ -36,8 +36,6 @@ typedef struct _frame {
            non-generator frames. See the save_exc_state and swap_exc_state
            functions in ceval.c for details of their use. */
     PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
-    /* Borrowed referenced to a generator, or NULL */
-    PyObject *f_gen;
 
     PyThreadState *f_tstate;
     int f_lasti;                /* Last instruction if called */
@@ -86,13 +84,6 @@ PyAPI_FUNC(void) _PyFrame_DebugMallocStats(FILE *out);
 /* Return the line of code the frame is currently executing. */
 PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *);
 
-/* Generator support */
-PyAPI_FUNC(PyObject *) _PyFrame_YieldingFrom(PyFrameObject *);
-PyAPI_FUNC(PyObject *) _PyFrame_GeneratorSend(PyFrameObject *, PyObject *, int exc);
-PyAPI_FUNC(PyObject *) _PyFrame_Finalize(PyFrameObject *);
-PyAPI_FUNC(int) _PyFrame_CloseIterator(PyObject *);
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/Include/genobject.h b/Include/genobject.h
index b8796f23a8..ed451baf3c 100644
--- a/Include/genobject.h
+++ b/Include/genobject.h
@@ -33,7 +33,6 @@ PyAPI_DATA(PyTypeObject) PyGen_Type;
 #define PyGen_CheckExact(op) (Py_TYPE(op) == &PyGen_Type)
 
 PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *);
-/* Deprecated, kept for backwards compatibility. */
 PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *);
 PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **);
 PyObject *_PyGen_Send(PyGenObject *, PyObject *);