fixed set.__ror__ operator to behave according to type

Author: joohongpark

Lib/test/test_dict.py

@@ -670,8 +670,6 @@ def test_dictview_set_operations_on_items(self):
         self.assertEqual(k1 ^ k2, {(3,3)})
         self.assertEqual(k1 ^ k3, {(1,1), (2,2), (4,4)})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_dictview_mixed_set_operations(self):
         # Just a few for .keys()
         self.assertTrue({1:1}.keys() == {1})

vm/src/builtins/set.rs

@@ -15,8 +15,8 @@ use crate::{
         Unconstructible, Unhashable,
     },
     vm::{ReprGuard, VirtualMachine},
-    IdProtocol, PyClassImpl, PyComparisonValue, PyContext, PyObject, PyObjectRef, PyRef, PyResult,
-    PyValue, TryFromObject, TypeProtocol,
+    IdProtocol, PyArithmeticValue, PyClassImpl, PyComparisonValue, PyContext, PyObject,
+    PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, TypeProtocol,
 };
 use std::{fmt, ops::Deref};
 
@@ -485,8 +485,13 @@ impl PySet {
 
     #[pymethod(name = "__ror__")]
     #[pymethod(magic)]
-    fn or(&self, other: SetIterable, vm: &VirtualMachine) -> PyResult<Self> {
-        self.union(other.iterable, vm)
+    fn or(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyArithmeticValue<Self>> {
+        if other.isinstance(&vm.ctx.types.set_type) || other.isinstance(&vm.ctx.types.frozenset_type) {
+            let val = PosArgs::new(vec![ArgIterable::try_from_object(vm, other)?]);
+            Ok(PyArithmeticValue::Implemented(self.union(val, vm)?))
+        } else {
+            Ok(PyArithmeticValue::NotImplemented)
+        }
     }
 
     #[pymethod(name = "__rand__")]
@@ -770,8 +775,13 @@ impl PyFrozenSet {
 
     #[pymethod(name = "__ror__")]
     #[pymethod(magic)]
-    fn or(&self, other: SetIterable, vm: &VirtualMachine) -> PyResult<Self> {
-        self.union(other.iterable, vm)
+    fn or(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyArithmeticValue<Self>> {
+        if other.isinstance(&vm.ctx.types.set_type) || other.isinstance(&vm.ctx.types.frozenset_type) {
+            let val = PosArgs::new(vec![ArgIterable::try_from_object(vm, other)?]);
+            Ok(PyArithmeticValue::Implemented(self.union(val, vm)?))
+        } else {
+            Ok(PyArithmeticValue::NotImplemented)
+        }
     }
 
     #[pymethod(name = "__rand__")]