Skip to content

Fix itertools count repr #3824

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 5 commits into from
Jul 1, 2022
Merged

Fix itertools count repr #3824

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd3bcae
Fix itertools count repr
mumallaeng Jun 28, 2022
c07d865
Fix itertools count repr
mumallaeng Jun 29, 2022
3f8eb24
Fix itertools count repr
mumallaeng Jun 30, 2022
5786a06
Update itertools count repr
mumallaeng Jun 30, 2022
27a0d3a
Update itertools count repr
mumallaeng Jun 30, 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
13 changes: 8 additions & 5 deletions vm/src/stdlib/itertools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mod decl {
AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, PyWeakRef, VirtualMachine,
};
use crossbeam_utils::atomic::AtomicCell;
use num_traits::{Signed, ToPrimitive};
use num_traits::{Signed, ToPrimitive, One};
use std::fmt;

#[pyattr]
Expand Down Expand Up @@ -220,10 +220,13 @@ mod decl {
}

#[pymethod(magic)]
fn repr(&self) -> PyResult<String> {
let cur = self.cur.read();

Ok(format!("count({})", cur))
fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {
let cur = format!("{}", self.cur.read().clone().repr(vm)?);
let step = self.step.as_bigint();
if step.is_one() {
return Ok(format!("count({})", cur));
}
Ok(format!("count({}, {})", cur, step.to_string()))
}
}
impl IterNextIterable for PyItertoolsCount {}
Expand Down