Skip to content

Commit

Permalink
bpo-44632: Fix support of TypeVar in the union type (GH-27139) (GH-27143
Browse files Browse the repository at this point in the history
)

int | TypeVar('T') returns now an instance of types.Union
instead of typing.Union.
(cherry picked from commit a158b20)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
  • Loading branch information
miss-islington and serhiy-storchaka committed Jul 15, 2021
1 parent 6dec525 commit cc1a47c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion Lib/test/test_types.py
Expand Up @@ -759,6 +759,7 @@ def test_or_type_repr(self):
assert repr(int | None) == "int | None"
assert repr(int | type(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 @@ -795,13 +796,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
Expand Up @@ -124,7 +124,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

0 comments on commit cc1a47c

Please sign in to comment.