Merge pull request #4253 from oow214/qualname_type

DimitrisJim · web-flow · commit 77b821a19410 · 2022-10-29T15:36:45.000+03:00
Fix `repr` for union
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
@@ -929,8 +929,6 @@ def test_or_type_operator_with_SpecialForm(self):
         assert typing.Optional[int] | str == typing.Union[int, str, None]
         assert typing.Union[int, bool] | str == typing.Union[int, bool, str]
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_or_type_repr(self):
         assert repr(int | str) == "int | str"
         assert repr((int | str) | list) == "int | str | list"
diff --git a/vm/src/builtins/union.rs b/vm/src/builtins/union.rs
@@ -43,7 +43,7 @@ impl PyUnion {
     #[pymethod(magic)]
     fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {
         fn repr_item(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {
-            if vm.is_none(&obj) {
+            if obj.is(vm.ctx.types.none_type) {
                 return Ok("None".to_string());
             }
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl PyUnion {`
`43`	`43`	`#[pymethod(magic)]`
`44`	`44`	`fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {`
`45`	`45`	`fn repr_item(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {`
`46`		`- if vm.is_none(&obj) {`
	`46`	`+ if obj.is(vm.ctx.types.none_type) {`
`47`	`47`	`return Ok("None".to_string());`
`48`	`48`	`}`
`49`	`49`