Commitaff07cf

authored

Merge pull requestRustPython#4390 from garychia/islice-reduce

Implement islice.__reduce__

2 parents10c9db6 +49597bc commitaff07cfCopy full SHA for aff07cf

File tree

+40

-0

lines changed

+40

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,28 +260,39 @@ def underten(x):`
`260`	`260`	`defassert_matches_seq(it,seq):`
`261`	`261`	`assertlist(it)==list(seq)`
`262`	`262`
	`263`	`+deftest_islice_pickle(it):`
	`264`	`+forpinrange(pickle.HIGHEST_PROTOCOL+1):`
	`265`	`+it==pickle.loads(pickle.dumps(it,p))`
	`266`	`+`
`263`	`267`	`i=itertools.islice`
`264`	`268`
`265`	`269`	`it=i([1,2,3,4,5],3)`
`266`	`270`	`assert_matches_seq(it, [1,2,3])`
	`271`	`+test_islice_pickle(it)`
`267`	`272`
`268`	`273`	`it=i([0.5,1,1.5,2,2.5,3,4,5],1,6,2)`
`269`	`274`	`assert_matches_seq(it, [1,2,3])`
	`275`	`+test_islice_pickle(it)`
`270`	`276`
`271`	`277`	`it=i([1,2],None)`
`272`	`278`	`assert_matches_seq(it, [1,2])`
	`279`	`+test_islice_pickle(it)`
`273`	`280`
`274`	`281`	`it=i([1,2,3],None,None,None)`
`275`	`282`	`assert_matches_seq(it, [1,2,3])`
	`283`	`+test_islice_pickle(it)`
`276`	`284`
`277`	`285`	`it=i([1,2,3],1,None,None)`
`278`	`286`	`assert_matches_seq(it, [2,3])`
	`287`	`+test_islice_pickle(it)`
`279`	`288`
`280`	`289`	`it=i([1,2,3],None,2,None)`
`281`	`290`	`assert_matches_seq(it, [1,2])`
	`291`	`+test_islice_pickle(it)`
`282`	`292`
`283`	`293`	`it=i([1,2,3],None,None,3)`
`284`	`294`	`assert_matches_seq(it, [1])`
	`295`	`+test_islice_pickle(it)`
`285`	`296`
`286`	`297`	`# itertools.filterfalse`
`287`	`298`	`it=itertools.filterfalse(lambdax:x%2,range(10))`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -924,6 +924,35 @@ mod decl {`
`924`	`924`	`.into_ref_with_type(vm, cls)`
`925`	`925`	`.map(Into::into)`
`926`	`926`	`}`
	`927`	`+`
	`928`	`+#[pymethod(magic)]`
	`929`	`+fnreduce(zelf:PyRef<Self>,vm:&VirtualMachine) ->PyResult<PyTupleRef>{`
	`930`	`+let cls = zelf.class().to_owned();`
	`931`	`+let itr = zelf.iterable.clone();`
	`932`	`+let cur = zelf.cur.take();`
	`933`	`+let next = zelf.next.take();`
	`934`	`+let step = zelf.step;`
	`935`	`+match zelf.stop{`
	`936`	`+Some(stop) =>Ok(vm.new_tuple((cls,(itr, next, stop, step),(cur,)))),`
	`937`	`+ _ =>Ok(vm.new_tuple((cls,(itr, next, vm.new_pyobj(()), step),(cur,)))),`
	`938`	`+}`
	`939`	`+}`
	`940`	`+`
	`941`	`+#[pymethod(magic)]`
	`942`	`+fnsetstate(zelf:PyRef<Self>,state:PyTupleRef,vm:&VirtualMachine) ->PyResult<()>{`
	`943`	`+let args = state.as_slice();`
	`944`	`+if args.len() !=1{`
	`945`	`+let msg =format!("function takes exactly 1 argument ({} given)", args.len());`
	`946`	`+returnErr(vm.new_type_error(msg));`
	`947`	`+}`
	`948`	`+let cur =&args[0];`
	`949`	`+ifletOk(cur) = usize::try_from_object(vm, cur.clone()){`
	`950`	`+ zelf.cur.store(cur);`
	`951`	`+}else{`
	`952`	`+returnErr(vm.new_type_error(String::from("Argument must be usize.")));`
	`953`	`+}`
	`954`	`+Ok(())`
	`955`	`+}`
`927`	`956`	`}`
`928`	`957`
`929`	`958`	`implIterNextIterableforPyItertoolsIslice{}`

Comments

(0)