bpo-44632: Fix support of TypeVar in the union type (GH-27139)
int | TypeVar('T') returns now an instance of types.Union
instead of typing.Union.diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index bc7e6a6..8f529a0 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -769,6 +769,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]
@@ -805,13 +806,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):
diff --git a/Objects/unionobject.c b/Objects/unionobject.c
index bdcdb74..8818cc2 100644
--- a/Objects/unionobject.c
+++ b/Objects/unionobject.c
@@ -127,7 +127,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 *
