Merge pull request RustPython#4767 from jyj0816/weakref

Add Hash and Iter of WeakProxy.rs for test\testWeakref.py

Author: youknowone

Lib/test/test_weakref.py

@@ -432,8 +432,6 @@ def __iter__(self):
             # can be killed in the middle of the call
             "blech" in p
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_proxy_next(self):
         arr = [4, 5, 6]
         def iterator_func():
@@ -478,8 +476,6 @@ def __reversed__(self):
         obj = MyObj()
         self.assertEqual("".join(reversed(weakref.proxy(obj))), "cba")
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_proxy_hash(self):
         class MyObj:
             def __hash__(self):

vm/src/builtins/weakproxy.rs

@@ -1,19 +1,19 @@
-use once_cell::sync::Lazy;
-
 use super::{PyStr, PyStrRef, PyType, PyTypeRef, PyWeak};
 use crate::{
     atomic_func,
     class::PyClassImpl,
+    common::hash::PyHash,
     function::{OptionalArg, PyComparisonValue, PySetterValue},
-    protocol::{PyMappingMethods, PySequenceMethods},
+    protocol::{PyIter, PyIterReturn, PyMappingMethods, PySequenceMethods},
     types::{
-        AsMapping, AsSequence, Comparable, Constructor, GetAttr, PyComparisonOp, Representable,
-        SetAttr,
+        AsMapping, AsSequence, Comparable, Constructor, GetAttr, Hashable, IterNext, Iterable,
+        PyComparisonOp, Representable, SetAttr,
     },
     Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
 };
+use once_cell::sync::Lazy;
 
-#[pyclass(module = false, name = "weakproxy")]
+#[pyclass(module = false, name = "weakproxy", unhashable = true)]
 #[derive(Debug)]
 pub struct PyWeakProxy {
     weak: PyRef<PyWeak>,
@@ -71,7 +71,8 @@ crate::common::static_cell! {
     Comparable,
     AsSequence,
     AsMapping,
-    Representable
+    Representable,
+    IterNext
 ))]
 impl PyWeakProxy {
     fn try_upgrade(&self, vm: &VirtualMachine) -> PyResult {
@@ -123,6 +124,20 @@ impl PyWeakProxy {
     }
 }
 
+impl Iterable for PyWeakProxy {
+    fn iter(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult {
+        let obj = zelf.try_upgrade(vm)?;
+        Ok(obj.get_iter(vm)?.into())
+    }
+}
+
+impl IterNext for PyWeakProxy {
+    fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
+        let obj = zelf.try_upgrade(vm)?;
+        PyIter::new(obj).next(vm)
+    }
+}
+
 fn new_reference_error(vm: &VirtualMachine) -> PyRef<super::PyBaseException> {
     vm.new_exception_msg(
         vm.ctx.exceptions.reference_error.to_owned(),
@@ -212,3 +227,9 @@ impl Representable for PyWeakProxy {
 pub fn init(context: &Context) {
     PyWeakProxy::extend_class(context, context.types.weakproxy_type);
 }
+
+impl Hashable for PyWeakProxy {
+    fn hash(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyHash> {
+        zelf.try_upgrade(vm)?.hash(vm)
+    }
+}