Fix is_unionable type_type check (#3852)

yonmilk · Karatuss · web-flow · commit 0c58d7bc1d2a · 2022-07-09T21:25:15.000+09:00
Co-Authored-By: Hyunmin Shin &lt;shm1193@gmail.com&gt;
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
@@ -868,8 +868,6 @@ def forward_before(x: ForwardBefore[int]) -> None: ...
         assert typing.get_args(typing.get_type_hints(forward_after)['x']) == (int, Forward)
         assert typing.get_args(typing.get_type_hints(forward_before)['x']) == (int, Forward)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_or_type_operator_with_Protocol(self):
         class Proto(typing.Protocol):
             def meth(self) -> int:
@@ -884,8 +882,6 @@ def test_or_type_operator_with_NamedTuple(self):
         NT=namedtuple('A', ['B', 'C', 'D'])
         assert NT | str == typing.Union[NT,str]
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_or_type_operator_with_TypedDict(self):
         class Point2D(typing.TypedDict):
             x: int
diff --git a/vm/src/builtins/union.rs b/vm/src/builtins/union.rs
@@ -104,7 +104,7 @@ impl PyUnion {
 
 pub fn is_unionable(obj: PyObjectRef, vm: &VirtualMachine) -> bool {
     obj.class().is(vm.ctx.types.none_type)
-        || obj.class().is(vm.ctx.types.type_type)
+        || obj.payload_if_subclass::<PyType>(vm).is_some()
         || obj.class().is(vm.ctx.types.generic_alias_type)
         || obj.class().is(vm.ctx.types.union_type)
 }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ impl PyUnion {`
`104`	`104`
`105`	`105`	`pub fn is_unionable(obj: PyObjectRef, vm: &VirtualMachine) -> bool {`
`106`	`106`	`obj.class().is(vm.ctx.types.none_type)`
`107`		`- \|\| obj.class().is(vm.ctx.types.type_type)`
	`107`	`+ \|\| obj.payload_if_subclass::<PyType>(vm).is_some()`
`108`	`108`	`\|\| obj.class().is(vm.ctx.types.generic_alias_type)`
`109`	`109`	`\|\| obj.class().is(vm.ctx.types.union_type)`
`110`	`110`	`}`