Reflect feedbacks

jopemachine · jopemachine · commit 6364ad49334d · 2022-07-16T17:54:41.000+09:00
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
@@ -1173,6 +1173,8 @@ def test_copy(self):
         self.assertEqual(view['key1'], 70)
         self.assertEqual(copy['key1'], 27)
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_union(self):
         mapping = {'a': 0, 'b': 1, 'c': 2}
         view = self.mappingproxy(mapping)
@@ -1185,8 +1187,7 @@ def test_union(self):
         other = {'c': 3, 'p': 0}
         self.assertDictEqual(view | other, {'a': 0, 'b': 1, 'c': 3, 'p': 0})
         self.assertDictEqual(other | view, {'c': 2, 'p': 0, 'a': 0, 'b': 1})
-        # Should be test after implementing MappingProxy's Comparable trait
-        # self.assertEqual(view, {'a': 0, 'b': 1, 'c': 2})
+        self.assertEqual(view, {'a': 0, 'b': 1, 'c': 2})
         self.assertDictEqual(mapping, {'a': 0, 'b': 1, 'c': 2})
         self.assertDictEqual(other, {'c': 3, 'p': 0})
 
diff --git a/vm/src/builtins/mappingproxy.rs b/vm/src/builtins/mappingproxy.rs
@@ -3,8 +3,8 @@ use crate::{
     class::PyClassImpl,
     convert::ToPyObject,
     function::{ArgMapping, OptionalArg},
-    protocol::{PyMapping, PyMappingMethods, PySequence, PySequenceMethods},
-    types::{AsMapping, AsSequence, Constructor, Iterable},
+    protocol::{PyMapping, PyMappingMethods, PyNumberMethods, PySequence, PySequenceMethods},
+    types::{AsMapping, AsNumber, AsSequence, Constructor, Iterable},
     AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
 };
 
@@ -152,25 +152,26 @@ impl PyMappingProxy {
 
     #[pymethod(magic)]
     fn reversed(&self, vm: &VirtualMachine) -> PyResult {
-        let obj = self.to_object(vm)?;
-        let reversed_method = vm.get_method(obj, identifier!(vm, __reversed__)).unwrap();
-        vm.invoke(&reversed_method?, ())
+        vm.call_method(
+            self.to_object(vm)?.as_object(),
+            identifier!(vm, __reversed__).as_str(),
+            (),
+        )
     }
 
     #[pymethod(magic)]
     fn ior(&self, _args: PyObjectRef, vm: &VirtualMachine) -> PyResult {
-        Err(vm.new_type_error("\"'|=' is not supported by %s; use '|' instead\"".to_owned()))
+        Err(vm.new_type_error(format!(
+            "\"'|=' is not supported by {}; use '|' instead\"",
+            Self::class(vm)
+        )))
     }
 
+    #[pymethod(name = "__ror__")]
     #[pymethod(magic)]
     fn or(&self, args: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         vm._or(self.copy(vm)?.as_ref(), args.as_ref())
     }
-
-    #[pymethod(magic)]
-    fn ror(&self, args: PyObjectRef, vm: &VirtualMachine) -> PyResult {
-        vm._or(args.as_ref(), self.copy(vm)?.as_ref())
-    }
 }
 
 impl AsMapping for PyMappingProxy {
@@ -186,11 +187,18 @@ impl AsMapping for PyMappingProxy {
 impl AsSequence for PyMappingProxy {
     const AS_SEQUENCE: PySequenceMethods = PySequenceMethods {
         contains: Some(|seq, target, vm| Self::sequence_downcast(seq)._contains(target, vm)),
-        length: Some(|seq, vm| Self::sequence_downcast(seq).len(vm)),
         ..PySequenceMethods::NOT_IMPLEMENTED
     };
 }
 
+impl AsNumber for PyMappingProxy {
+    const AS_NUMBER: PyNumberMethods = PyNumberMethods {
+        or: Some(|num, args, vm| Self::number_downcast(num).or(args.to_pyobject(vm), vm)),
+        inplace_or: Some(|num, args, vm| Self::number_downcast(num).ior(args.to_pyobject(vm), vm)),
+        ..PyNumberMethods::NOT_IMPLEMENTED
+    };
+}
+
 impl Iterable for PyMappingProxy {
     fn iter(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult {
         let obj = zelf.to_object(vm)?;
