Visitar URL original
bpo-41171: Added method "PyMetaType_FromSpec" to allow for specifying the metaclass for the type. by WildCard65 · Pull Request #21238 · python/cpython · GitHub
Skip to content

bpo-41171: Added method "PyMetaType_FromSpec" to allow for specifying the metaclass for the type. #21238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WildCard65 wants to merge 7 commits into from
Closed

bpo-41171: Added method "PyMetaType_FromSpec" to allow for specifying the metaclass for the type. #21238

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e73355
bpo-41171: Added companion "FromSpec" methods prefixed with "PyMetaTy…
WildCard65 Jun 30, 2020
745387c
Removed 'PyMetaType_FromSpecAndBases'.
WildCard65 Jun 30, 2020
e2cde2c
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 30, 2020
faa247a
Fixed documentation error of 'PyType_FromSpecWithBases'
WildCard65 Jun 30, 2020
9089911
Fixed dangling function export.
WildCard65 Jun 30, 2020
1ea9a54
Renamed "PyMetaType_FromModuleAndSpec" to "PyMetaType_FromSpec".
WildCard65 Jun 30, 2020
df908fe
Updated NEWS entry to reflect changes.
WildCard65 Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Renamed "PyMetaType_FromModuleAndSpec" to "PyMetaType_FromSpec". 
Removed other "PyMetaType" variants.
  • Loading branch information
@WildCard65
WildCard65 committed Jun 30, 2020
commit 1ea9a54a798080c7793e33b2595a435654a0b8e2
14 changes: 4 additions & 10 deletions Doc/c-api/type.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ The following functions and structs are used to create

.. c:function:: PyObject* PyType_FromModuleAndSpec(PyObject *module, PyType_Spec *spec, PyObject *bases)

Equivalent to ``PyMetaType_FromModuleAndSpec(module, &PyType_Type, spec, bases)``.
Equivalent to ``PyMetaType_FromSpec(module, &PyType_Type, spec, bases)``.

.. versionadded:: 3.9

.. c:function:: PyObject* PyMetaType_FromModuleAndSpec(PyObject *module, PyTypeObject *meta_type, PyType_Spec *spec, PyObject *bases)
.. c:function:: PyObject* PyMetaType_FromSpec(PyObject *module, PyTypeObject *meta_type, PyType_Spec *spec, PyObject *bases)

Creates and returns a heap type object from the *spec* whose's metaclass is *meta_type*
(:const:`Py_TPFLAGS_HEAPTYPE`).
Expand All @@ -171,19 +171,13 @@ The following functions and structs are used to create

.. c:function:: PyObject* PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)

Equivalent to ``PyMetaType_FromModuleAndSpec(NULL, &PyType_Type, spec, bases)``.
Equivalent to ``PyMetaType_FromSpec(NULL, &PyType_Type, spec, bases)``.

.. versionadded:: 3.3

.. c:function:: PyObject* PyType_FromSpec(PyType_Spec *spec)

Equivalent to ``PyMetaType_FromSpec(&PyType_Type, spec)``.

.. c:function:: PyObject* PyMetaType_FromSpec(PyTypeObject *meta_type, PyType_Spec *spec)

Equivalent to ``PyMetaType_FromModuleAndSpec(NULL, meta_type, spec, NULL)``

.. versionadded:: 3.10
Equivalent to ``PyMetaType_FromSpec(NULL, &PyType_Type, spec, NULL)``.

.. c:type:: PyType_Spec

Expand Down
9 changes: 4 additions & 5 deletions Include/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,17 +225,16 @@ typedef struct{
PyType_Slot *slots; /* terminated by slot==0. */
} PyType_Spec;

#define PyType_FromSpec(spec) PyMetaType_FromSpec(&PyType_Type, spec)
PyAPI_FUNC(PyObject*) PyMetaType_FromSpec(PyTypeObject*, PyType_Spec*);
#define PyType_FromSpec(spec) PyMetaType_FromSpec(NULL, &PyType_Type, spec, NULL)
PyAPI_FUNC(PyObject*) PyMetaType_FromSpec(PyObject*, PyTypeObject*, PyType_Spec*, PyObject*);
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
#define PyType_FromSpecWithBases(spec, bases) PyMetaType_FromModuleAndSpec(NULL, &PyType_Type, spec, bases)
#define PyType_FromSpecWithBases(spec, bases) PyMetaType_FromSpec(NULL, &PyType_Type, spec, bases)
#endif
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
PyAPI_FUNC(void*) PyType_GetSlot(PyTypeObject*, int);
#endif
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
#define PyType_FromModuleAndSpec(module, spec, bases) PyMetaType_FromModuleAndSpec(module, &PyType_Type, spec, bases)
PyAPI_FUNC(PyObject*) PyMetaType_FromModuleAndSpec(PyObject*, PyTypeObject*, PyType_Spec*, PyObject*);
#define PyType_FromModuleAndSpec(module, spec, bases) PyMetaType_FromSpec(module, &PyType_Type, spec, bases)
PyAPI_FUNC(PyObject *) PyType_GetModule(struct _typeobject *);
PyAPI_FUNC(void *) PyType_GetModuleState(struct _typeobject *);
#endif
Expand Down
8 changes: 1 addition & 7 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2880,7 +2880,7 @@ static const short slotoffsets[] = {
};

PyObject *
PyMetaType_FromModuleAndSpec(PyObject *module, PyTypeObject *meta_type, PyType_Spec *spec, PyObject *bases)
PyMetaType_FromSpec(PyObject *module, PyTypeObject *meta_type, PyType_Spec *spec, PyObject *bases)
{
if (meta_type == NULL) {
PyErr_BadArgument();
Expand Down Expand Up @@ -3097,12 +3097,6 @@ PyMetaType_FromModuleAndSpec(PyObject *module, PyTypeObject *meta_type, PyType_S
return NULL;
}

PyObject *
PyMetaType_FromSpec(PyTypeObject *meta_type, PyType_Spec *spec)
{
return PyMetaType_FromModuleAndSpec(NULL, meta_type, spec, NULL);
}

void *
PyType_GetSlot(PyTypeObject *type, int slot)
{
Expand Down
1 change: 0 additions & 1 deletion PC/python3dll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,6 @@ EXPORT_FUNC(PyTuple_SetItem)
EXPORT_FUNC(PyTuple_Size)
EXPORT_FUNC(PyType_ClearCache)
EXPORT_FUNC(PyMetaType_FromSpec)
EXPORT_FUNC(PyMetaType_FromModuleAndSpec)
EXPORT_FUNC(PyType_GenericAlloc)
EXPORT_FUNC(PyType_GenericNew)
EXPORT_FUNC(PyType_GetFlags)
Expand Down