Skip to content

dict iterator __reduce__ to resume from current position #8384

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 3 commits into from
Jul 27, 2026
+34 −20
Merged

dict iterator __reduce__ to resume from current position #8384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75d60e7
Fix dict iterator __reduce__ to resume from current position
zzarbttoo Jul 26, 2026
dee77d0
Apply cargo fmt to dict.rs imports
zzarbttoo Jul 26, 2026
ec133b1
Unmark TestSyncManagerTypes.test_dict as expectedFailure
zzarbttoo Jul 26, 2026
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
1 change: 0 additions & 1 deletion Lib/test/_test_multiprocessing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6791,7 +6791,6 @@ def _test_dict(cls, obj):
obj.clear()
case.assertEqual(len(obj), 0)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_dict(self):
o = self.manager.dict()
o['foo'] = 5
Expand Down
48 changes: 30 additions & 18 deletions crates/vm/src/builtins/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ use crate::object::{Traverse, TraverseFn};
use crate::{
AsObject, Context, Py, PyExact, PyObject, PyObjectRef, PyPayload, PyRef, PyRefExact, PyResult,
TryFromObject, atomic_func,
builtins::{
PyTuple,
iter::{builtins_iter, builtins_reversed},
type_::PyAttributes,
},
builtins::{PyTuple, iter::builtins_iter, type_::PyAttributes},
class::{PyClassDef, PyClassImpl},
common::ascii,
dict_inner::{self, DictKey},
Expand Down Expand Up @@ -1118,10 +1114,17 @@ macro_rules! dict_view {
let iter = builtins_iter(vm);
let internal = self.internal.lock();
let entries = match &internal.status {
IterStatus::Active(dict) => dict
.into_iter()
.map(|(key, value)| ($result_fn)(vm, key, value))
.collect::<Vec<_>>(),
IterStatus::Active(dict) => {
let mut position = internal.position;
let mut entries = Vec::new();
while let Some((next_position, key, value)) =
dict.entries.next_entry(position)
{
entries.push(($result_fn)(vm, key, value));
position = next_position;
}
entries
}
IterStatus::Exhausted => vec![],
};
vm.new_tuple((iter, (vm.ctx.new_list(entries),)))
Expand Down Expand Up @@ -1184,14 +1187,23 @@ macro_rules! dict_view {

#[pymethod]
fn __reduce__(&self, vm: &VirtualMachine) -> PyTupleRef {
let iter = builtins_reversed(vm);
let iter = builtins_iter(vm);
let internal = self.internal.lock();
// TODO: entries must be reversed too
let entries = match &internal.status {
IterStatus::Active(dict) => dict
.into_iter()
.map(|(key, value)| ($result_fn)(vm, key, value))
.collect::<Vec<_>>(),
IterStatus::Active(dict) => {
let mut position = internal.position;
let mut entries = Vec::new();
while let Some((found_index, key, value)) =
dict.entries.prev_entry(position)
{
entries.push(($result_fn)(vm, key, value));
if found_index == 0 {
break;
}
position = found_index - 1;
}
entries
}
IterStatus::Exhausted => vec![],
};
vm.new_tuple((iter, (vm.ctx.new_list(entries),)))
Expand All @@ -1218,11 +1230,11 @@ macro_rules! dict_view {
);
}
match dict.entries.prev_entry(internal.position) {
Some((position, key, value)) => {
if internal.position == position {
Some((found_index, key, value)) => {
if found_index == 0 {
internal.status = IterStatus::Exhausted;
} else {
internal.position = position;
internal.position = found_index - 1;
}
PyIterReturn::Return(($result_fn)(vm, key, value))
}
Expand Down
5 changes: 4 additions & 1 deletion crates/vm/src/dict_inner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,10 +861,13 @@ impl<T: Clone> Dict<T> {
let inner = self.read();
loop {
let entry = inner.entries.get(position)?;
position = position.saturating_sub(1);
if let Some(entry) = entry {
break Some((position, entry.key.clone(), entry.value.clone()));
}
if position == 0 {
break None;
}
position -= 1;
}
}

Expand Down
Loading