Skip to content

Add itertools.compress.__reduce__ #3791

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 4 commits into from
Jun 16, 2022
Merged

Add itertools.compress.__reduce__ #3791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50dba86
test: itertools.compress
rng-dynamics Jun 16, 2022
81d2df8
fix: itertools.compress keyword arguments
rng-dynamics Jun 16, 2022
dbdbdc8
feat: itertools.compress.__reduce__
rng-dynamics Jun 16, 2022
e4267d9
rustfmt
rng-dynamics Jun 16, 2022
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_itertools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,6 @@ def test_combinatorics(self):
self.assertEqual(comb, list(filter(set(perm).__contains__, cwr))) # comb: cwr that is a perm
self.assertEqual(comb, sorted(set(cwr) & set(perm))) # comb: both a cwr and a perm

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_compress(self):
self.assertEqual(list(compress(data='ABCDEF', selectors=[1,0,1,0,1,1])), list('ACEF'))
self.assertEqual(list(compress('ABCDEF', [1,0,1,0,1,1])), list('ACEF'))
Expand Down
24 changes: 16 additions & 8 deletions vm/src/stdlib/itertools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,39 +116,47 @@ mod decl {
#[derive(Debug, PyPayload)]
struct PyItertoolsCompress {
data: PyIter,
selector: PyIter,
selectors: PyIter,
}

#[derive(FromArgs)]
struct CompressNewArgs {
#[pyarg(positional)]
#[pyarg(any)]
data: PyIter,
#[pyarg(positional)]
selector: PyIter,
#[pyarg(any)]
selectors: PyIter,
}

impl Constructor for PyItertoolsCompress {
type Args = CompressNewArgs;

fn py_new(
cls: PyTypeRef,
Self::Args { data, selector }: Self::Args,
Self::Args { data, selectors }: Self::Args,
vm: &VirtualMachine,
) -> PyResult {
PyItertoolsCompress { data, selector }
PyItertoolsCompress { data, selectors }
.into_ref_with_type(vm, cls)
.map(Into::into)
}
}

#[pyimpl(with(IterNext, Constructor))]
impl PyItertoolsCompress {}
impl PyItertoolsCompress {
#[pymethod(magic)]
fn reduce(zelf: PyRef<Self>) -> (PyTypeRef, (PyIter, PyIter)) {
(
zelf.class().clone(),
(zelf.data.clone(), zelf.selectors.clone()),
)
}
}

impl IterNextIterable for PyItertoolsCompress {}
impl IterNext for PyItertoolsCompress {
fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
loop {
let sel_obj = match zelf.selector.next(vm)? {
let sel_obj = match zelf.selectors.next(vm)? {
PyIterReturn::Return(obj) => obj,
PyIterReturn::StopIteration(v) => return Ok(PyIterReturn::StopIteration(v)),
};
Expand Down