Nov 3, 2020 · May 5, 2020 · Oct 20, 2020 · Oct 21, 2020 · Oct 21, 2020
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
 PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
 PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);
 struct PyModuleDef;
 PyAPI_FUNC(PyObject *) _PyType_GetModuleByDef(PyTypeObject *, struct PyModuleDef *);

 struct _Py_Identifier;
 PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c
 };


 static PyModuleDef def_meth_state_access;

 /*[clinic input]
 _testmultiphase.StateAccessType.get_defining_module

    cls: defining_class

 Return the module of the defining class.

 Also tests that result of _PyType_GetModuleByDef matches defining_class's
 module.
 [clinic start generated code]*/

 static PyObject *
 _testmultiphase_StateAccessType_get_defining_module_impl(StateAccessTypeObject *self,
                                                         PyTypeObject *cls)
 /*[clinic end generated code: output=ba2a14284a5d0921 input=946149f91cf72c0d]*/
 /*[clinic end generated code: output=ba2a14284a5d0921 input=356f999fc16e0933]*/
 {
    PyObject *retval;
    retval = PyType_GetModule(cls);
    if (retval == NULL) {
        return NULL;
    }
    assert(_PyType_GetModuleByDef(Py_TYPE(self), &def_meth_state_access) == retval);
    Py_INCREF(retval);
    return retval;
 }
diff --git a/Modules/clinic/_testmultiphase.c.h b/Modules/clinic/_testmultiphase.c.h
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
    return PyModule_GetState(m);
 }


 /* Get the module of the first superclass where the module has the
 * given PyModuleDef.
 * Implemented by walking the MRO, is relatively slow.
 *
 * This is internal API for experimentation within stdlib. Discussion:
 * https://mail.python.org/archives/list/capi-sig@python.org/thread/T3P2QNLNLBRFHWSKYSTPMVEIL2EEKFJU/
 */
 PyObject *
 _PyType_GetModuleByDef(PyTypeObject *type, struct PyModuleDef *def)
 {
    assert(PyType_Check(type));
    assert(type->tp_mro);
    int i;
    for (i = 0; i < PyTuple_GET_SIZE(type->tp_mro); i++) {
        PyObject *super = PyTuple_GET_ITEM(type->tp_mro, i);
        if (!PyType_HasFeature((PyTypeObject *)super, Py_TPFLAGS_HEAPTYPE)) {
            /* Currently, there's no way for static types to inherit
             * from heap types, but to allow that possibility,
             * we `continue` rather than `break`.
             * We'll just potentially loop a few more times before throwing
             * the error.
             */
            continue;
        }
        PyHeapTypeObject *ht = (PyHeapTypeObject*)super;
        if (ht->ht_module && PyModule_GetDef(ht->ht_module) == def) {
            return ht->ht_module;
        }
    }
    PyErr_Format(
        PyExc_TypeError,
        "_PyType_GetModuleByDef: No superclass of '%s' has the given module",
        type->tp_name);
    return NULL;
 }


 /* Internal API to look for a name through the MRO, bypassing the method cache.
   This returns a borrowed reference, and might set an exception.
   'error' is set to: -1: error with exception; 1: error without exception; 0: ok */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -296,6 +296,8 @@ PyAPI_FUNC(PyObject ) _PyObject_LookupSpecial(PyObject , _Py_Identifier *);
		PyAPI_FUNC(PyTypeObject ) _PyType_CalculateMetaclass(PyTypeObject , PyObject *);
		PyAPI_FUNC(PyObject ) _PyType_GetDocFromInternalDoc(const char , const char *);
		PyAPI_FUNC(PyObject ) _PyType_GetTextSignatureFromInternalDoc(const char , const char *);
		struct PyModuleDef;
		PyAPI_FUNC(PyObject ) _PyType_GetModuleByDef(PyTypeObject , struct PyModuleDef *);

		struct _Py_Identifier;
		PyAPI_FUNC(int) PyObject_Print(PyObject , FILE , int);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -121,24 +121,30 @@ static PyType_Spec Example_Type_spec = {
		};


		static PyModuleDef def_meth_state_access;

		/*[clinic input]
		_testmultiphase.StateAccessType.get_defining_module

		cls: defining_class

		Return the module of the defining class.

		Also tests that result of _PyType_GetModuleByDef matches defining_class's
		module.
		[clinic start generated code]*/

		static PyObject *
		_testmultiphase_StateAccessType_get_defining_module_impl(StateAccessTypeObject *self,
		PyTypeObject *cls)
		/[clinic end generated code: output=ba2a14284a5d0921 input=946149f91cf72c0d]/
		/[clinic end generated code: output=ba2a14284a5d0921 input=356f999fc16e0933]/
		{
		PyObject *retval;
		retval = PyType_GetModule(cls);
		if (retval == NULL) {
		return NULL;
		}
		assert(_PyType_GetModuleByDef(Py_TYPE(self), &def_meth_state_access) == retval);
		Py_INCREF(retval);
		return retval;
		}
Expand Down