Skip to content

bpo-44662: Add ability to annotate types.Union #27214

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

Merged
ambv merged 10 commits into from
Jul 29, 2021
Merged

bpo-44662: Add ability to annotate types.Union #27214

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5021ca7
bpo-44490: Add ability to serialise and annotate types.Union
uriyyo Jul 17, 2021
43556fe
Update news
uriyyo Jul 17, 2021
eb52dc8
Update unionobject
uriyyo Jul 19, 2021
2fcfafe
Remove Union serialisation code
uriyyo Jul 19, 2021
65558f2
Fix _strip_annotations
uriyyo Jul 19, 2021
8a13208
Remove whitespace
uriyyo Jul 19, 2021
36db2f5
Update Misc/NEWS.d/next/Core and Builtins/2021-07-17-13-41-58.bpo-446…
uriyyo Jul 19, 2021
136f81c
Add PyUnicode_Check to union_getattro
uriyyo Jul 19, 2021
f72e70f
Merge remote-tracking branch 'upstream/main' into fix-issue-44490
uriyyo Jul 25, 2021
b931632
Remove __name__ and __qualname__ attrs
uriyyo Jul 26, 2021
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
10 changes: 10 additions & 0 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3015,6 +3015,16 @@ def barfoo3(x: BA2): ...
get_type_hints(barfoo3, globals(), locals(), include_extras=True)["x"],
BA2
)
BA3 = typing.Annotated[int | float, "const"]
def barfoo4(x: BA3): ...
self.assertEqual(
get_type_hints(barfoo4, globals(), locals()),
{"x": int | float}
)
self.assertEqual(
get_type_hints(barfoo4, globals(), locals(), include_extras=True),
{"x": typing.Annotated[int | float, "const"]}
)

def test_get_type_hints_annotated_refs(self):

Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2021-07-17-13-41-58.bpo-44662.q22kWR.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Add ``__name__``, ``__qualname__`` and ``__module__`` to ``types.Union``.
This also fixes ``types.Union`` issues with ``typing.Annotated``.
Patch provided by Yurii Karabas.
26 changes: 25 additions & 1 deletion Objects/unionobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,30 @@ static PyNumberMethods union_as_number = {
.nb_or = _Py_union_type_or, // Add __or__ function
};

static const char* const cls_attrs[] = {
"__name__",
"__qualname__",
Comment thread
uriyyo marked this conversation as resolved.
Resolved
"__module__",
Comment thread
uriyyo marked this conversation as resolved.
Resolved
NULL,
};

static PyObject *
union_getattro(PyObject *self, PyObject *name)
{
unionobject *alias = (unionobject *)self;
if (PyUnicode_Check(name)) {
for (const char * const *p = cls_attrs; ; p++) {
if (*p == NULL) {
break;
}
if (_PyUnicode_EqualToASCIIString(name, *p)) {
return PyObject_GetAttr((PyObject *) Py_TYPE(alias), name);
}
}
}
return PyObject_GenericGetAttr(self, name);
}

PyTypeObject _PyUnion_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "types.Union",
Expand All @@ -435,7 +459,7 @@ PyTypeObject _PyUnion_Type = {
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
.tp_traverse = union_traverse,
.tp_hash = union_hash,
.tp_getattro = PyObject_GenericGetAttr,
.tp_getattro = union_getattro,
.tp_members = union_members,
.tp_methods = union_methods,
.tp_richcompare = union_richcompare,
Expand Down