Commit4e6172b

authored

Add object protocol correspoinding to PyObject_GetAIter (RustPython#5090)

1 parent9241e2e commit4e6172bCopy full SHA for 4e6172b

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`usecrate::{`
`5`	`5`	`builtins::{`
`6`		`- pystr::AsPyStr,PyBytes,PyDict,PyDictRef,PyGenericAlias,PyInt,PyList,PyStr,PyStrRef,`
`7`		`-PyTuple,PyTupleRef,PyType,PyTypeRef,`
	`6`	`+ pystr::AsPyStr,PyAsyncGen,PyBytes,PyDict,PyDictRef,PyGenericAlias,PyInt,PyList,`
	`7`	`+PyStr,PyStrRef,PyTuple,PyTupleRef,PyType,PyTypeRef,`
`8`	`8`	`},`
`9`	`9`	`bytesinner::ByteInnerNewOptions,`
`10`	`10`	`common::{hash::PyHash, str::to_ascii},`
`@@ -92,6 +92,13 @@ impl PyObject {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// PyObject PyObject_GetAIter(PyObject o)`
	`95`	`+pubfnget_aiter(&self,vm:&VirtualMachine) ->PyResult{`
	`96`	`+ifself.payload_is::<PyAsyncGen>(){`
	`97`	`+ vm.call_special_method(self,identifier!(vm, __aiter__),())`
	`98`	`+}else{`
	`99`	`+Err(vm.new_type_error("wrong argument type".to_owned()))`
	`100`	`+}`
	`101`	`+}`
`95`	`102`
`96`	`103`	`pubfnhas_attr<'a>(&self,attr_name:implAsPyStr<'a>,vm:&VirtualMachine) ->PyResult<bool>{`
`97`	`104`	`self.get_attr(attr_name, vm).map(\|o\| !vm.is_none(&o))`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ pub use builtins::{ascii, print, reversed};`
`9`	`9`	`mod builtins{`
`10`	`10`	`usecrate::{`
`11`	`11`	`builtins::{`
`12`		`- asyncgenerator::PyAsyncGen,`
`13`	`12`	`enumerate::PyReverseSequenceIterator,`
`14`	`13`	`function::{PyCellRef,PyFunction},`
`15`	`14`	`int::PyIntRef,`
`@@ -459,11 +458,7 @@ mod builtins {`
`459`	`458`
`460`	`459`	`#[pyfunction]`
`461`	`460`	`fnaiter(iter_target:PyObjectRef,vm:&VirtualMachine) ->PyResult{`
`462`		`-if iter_target.payload_is::<PyAsyncGen>(){`
`463`		`- vm.call_special_method(&iter_target,identifier!(vm, __aiter__),())`
`464`		`-}else{`
`465`		`-Err(vm.new_type_error("wrong argument type".to_owned()))`
`466`		`-}`
	`461`	`+ iter_target.get_aiter(vm)`
`467`	`462`	`}`
`468`	`463`
`469`	`464`	`#[pyfunction]`

Comments

(0)