Skip to content

Add weakproxy richcompare #3909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2022
Merged

Add weakproxy richcompare #3909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions vm/src/builtins/weakproxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use super::{PyStrRef, PyType, PyTypeRef, PyWeak};
use crate::{
class::PyClassImpl,
function::OptionalArg,
function::{OptionalArg, PyComparisonValue},
protocol::{PyMappingMethods, PySequence, PySequenceMethods},
types::{AsMapping, AsSequence, Constructor, GetAttr, SetAttr},
Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
types::{AsMapping, AsSequence, Comparable, Constructor, GetAttr, PyComparisonOp, SetAttr},
Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
};

#[pyclass(module = false, name = "weakproxy")]
Expand Down Expand Up @@ -83,6 +83,11 @@ impl PyWeakProxy {
self.try_upgrade(vm)?.bytes(vm)
}

#[pymethod(magic)]
fn repr(&self, vm: &VirtualMachine) -> PyResult<PyStrRef> {
self.try_upgrade(vm)?.repr(vm)
}

fn contains(&self, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
let obj = self.try_upgrade(vm)?;
PySequence::contains(&obj, &needle, vm)
Expand Down Expand Up @@ -136,6 +141,20 @@ impl SetAttr for PyWeakProxy {
}
}

impl Comparable for PyWeakProxy {
fn cmp(
zelf: &crate::Py<Self>,
other: &PyObject,
op: PyComparisonOp,
vm: &VirtualMachine,
) -> PyResult<PyComparisonValue> {
let obj = zelf.try_upgrade(vm)?;
Ok(PyComparisonValue::Implemented(
obj.rich_compare_bool(other, op, vm)?,
))
}
}

impl AsSequence for PyWeakProxy {
const AS_SEQUENCE: PySequenceMethods = PySequenceMethods {
length: Some(|seq, vm| Self::sequence_downcast(seq).len(vm)),
Expand Down