Skip to content

Add contains in dict_items #3259

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
youknowone merged 9 commits into from
Oct 10, 2021
Merged

Add contains in dict_items #3259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf11f5a
Add __contains__ in dict_items
Jack-R-lantern Oct 9, 2021
ab3145e
pull main branch & merge
Jack-R-lantern Oct 9, 2021
c852ce4
fix: remove unwrap
Jack-R-lantern Oct 9, 2021
d925880
Add testcase
Jack-R-lantern Oct 9, 2021
d59d5e1
remove file
Jack-R-lantern Oct 9, 2021
aef89ce
Add __contains__ in dict_items
Jack-R-lantern Oct 9, 2021
8056604
Add __contains__ in dict_items
Jack-R-lantern Oct 9, 2021
5a8c6ad
Add __contains__ in dict_items
Jack-R-lantern Oct 9, 2021
a0a61a6
Add __contains__ in dict_items
Jack-R-lantern Oct 9, 2021
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
2 changes: 0 additions & 2 deletions Lib/test/test_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,8 +1300,6 @@ def __eq__(self, other):
except RuntimeError: # implementation defined
pass

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_dictitems_contains_use_after_free(self):
class X:
def __eq__(self, other):
Expand Down
11 changes: 11 additions & 0 deletions extra_tests/snippets/builtin_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,14 @@
next(dict_reversed)
assert 'dict' in dict().__doc__

d = {'a': 123, 'b': 456}
assert 1 not in d.items()
assert 'a' not in d.items()
assert 'a', 123 not in d.items()
assert () not in d.items()
assert (1) not in d.items()
assert ('a') not in d.items()
assert ('a', 123) in d.items()
assert ('b', 456) in d.items()
assert ('a', 123, 3) not in d.items()
assert ('a', 123, 'b', 456) not in d.items()
21 changes: 21 additions & 0 deletions vm/src/builtins/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use super::{
PyTypeRef,
};
use crate::{
builtins::PyTuple,
common::ascii,
dictdatatype::{self, DictKey},
function::{ArgIterable, FuncArgs, IntoPyObject, KwArgs, OptionalArg},
Expand Down Expand Up @@ -982,6 +983,26 @@ impl PyDictItems {
let inner = zelf.difference(other, vm)?;
Ok(PySet { inner })
}

#[pymethod(magic)]
fn contains(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
let needle = match_class! {
match needle {
tuple @ PyTuple => tuple,
_ => return Ok(false),
}
};
if needle.len() != 2 {
return Ok(false);
}
let key = needle.fast_getitem(0);
if !zelf.dict().contains(key.clone(), vm)? {
return Ok(false);
}
let value = needle.fast_getitem(1);
let found = PyDict::getitem(zelf.dict().clone(), key, vm)?;
vm.identical_or_equal(&found, &value)
}
}

pub(crate) fn init(context: &PyContext) {
Expand Down