Skip to content

bpo-44632: Fix support of TypeVar in the union type #27139

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
serhiy-storchaka merged 1 commit into from
Jul 14, 2021
Merged

bpo-44632: Fix support of TypeVar in the union type #27139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion Lib/test/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ def test_or_type_operator_with_SpecialForm(self):
def test_or_type_repr(self):
assert repr(int | None) == "int | None"
assert repr(int | typing.GenericAlias(list, int)) == "int | list[int]"
assert repr(int | typing.TypeVar('T')) == "int | ~T"

def test_or_type_operator_with_genericalias(self):
a = list[int]
Expand Down Expand Up @@ -792,13 +793,18 @@ def __eq__(self, other):
issubclass(int, type_)

def test_or_type_operator_with_bad_module(self):
class TypeVar:
class BadMeta(type):
__qualname__ = 'TypeVar'
@property
def __module__(self):
1 / 0
TypeVar = BadMeta('TypeVar', (), {})
_SpecialForm = BadMeta('_SpecialForm', (), {})
# Crashes in Issue44483
with self.assertRaises(ZeroDivisionError):
str | TypeVar()
with self.assertRaises(ZeroDivisionError):
str | _SpecialForm()

@cpython_only
def test_or_type_operator_reference_cycle(self):
Expand Down
2 changes: 1 addition & 1 deletion Objects/unionobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ is_typing_name(PyObject *obj, char *name)
if (strcmp(type->tp_name, name) != 0) {
return 0;
}
return is_typing_module(obj);
return is_typing_module((PyObject *)type);
}

static PyObject *
Expand Down