Commit830389f

authored

implement dir for ByObjectRef (RustPython#5088)

1 parent2c3dbb5 commit830389fCopy full SHA for 830389f

File tree

+21

-18

lines changed

+21

-18

lines changed

Lines changed: 2 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-usesuper::{PyDict,PyDictRef,PyList,PyStr,PyStrRef,PyType,PyTypeRef};`
	`1`	`+usesuper::{PyDictRef,PyList,PyStr,PyStrRef,PyType,PyTypeRef};`
`2`	`2`	`usecrate::common::hash::PyHash;`
`3`	`3`	`usecrate::{`
`4`	`4`	`class::PyClassImpl,`
`@@ -252,22 +252,7 @@ impl PyBaseObject {`
`252`	`252`
`253`	`253`	`#[pymethod(magic)]`
`254`	`254`	`pubfndir(obj:PyObjectRef,vm:&VirtualMachine) ->PyResult<PyList>{`
`255`		`-let attributes = obj.class().get_attributes();`
`256`		`-`
`257`		`-let dict =PyDict::from_attributes(attributes, vm)?.into_ref(&vm.ctx);`
`258`		`-`
`259`		`-// Get instance attributes:`
`260`		`-ifletSome(object_dict) = obj.dict(){`
`261`		`- vm.call_method(`
`262`		`- dict.as_object(),`
`263`		`-identifier!(vm, update).as_str(),`
`264`		`-(object_dict,),`
`265`		`-)?;`
`266`		`-}`
`267`		`-`
`268`		`-let attributes:Vec<_> = dict.into_iter().map(\|(k, _v)\| k).collect();`
`269`		`-`
`270`		`-Ok(PyList::from(attributes))`
	`255`	`+ obj.dir(vm)`
`271`	`256`	`}`
`272`	`257`
`273`	`258`	`#[pymethod(magic)]`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,15 @@`
`3`	`3`
`4`	`4`	`usecrate::{`
`5`	`5`	`builtins::{`
`6`		`- pystr::AsPyStr,PyBytes,PyDict,PyDictRef,PyGenericAlias,PyInt,PyStr,PyStrRef,`
	`6`	`+ pystr::AsPyStr,PyBytes,PyDict,PyDictRef,PyGenericAlias,PyInt,PyList,PyStr,PyStrRef,`
`7`	`7`	`PyTuple,PyTupleRef,PyType,PyTypeRef,`
`8`	`8`	`},`
`9`	`9`	`bytesinner::ByteInnerNewOptions,`
`10`	`10`	`common::{hash::PyHash, str::to_ascii},`
`11`	`11`	`convert::{ToPyObject,ToPyResult},`
`12`	`12`	`dictdatatype::DictKey,`
`13`	`13`	`function::{Either,OptionalArg,PyArithmeticValue,PySetterValue},`
	`14`	`+ object::PyPayload,`
`14`	`15`	`protocol::{PyIter,PyMapping,PySequence},`
`15`	`16`	`types::{Constructor,PyComparisonOp},`
`16`	`17`	`AsObject,Py,PyObject,PyObjectRef,PyResult,TryFromObject,VirtualMachine,`
`@@ -62,6 +63,23 @@ impl PyObjectRef {`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`// PyObject PyObject_Dir(PyObject o)`
	`66`	`+pubfndir(self,vm:&VirtualMachine) ->PyResult<PyList>{`
	`67`	`+let attributes =self.class().get_attributes();`
	`68`	`+`
	`69`	`+let dict =PyDict::from_attributes(attributes, vm)?.into_ref(&vm.ctx);`
	`70`	`+`
	`71`	`+ifletSome(object_dict) =self.dict(){`
	`72`	`+ vm.call_method(`
	`73`	`+ dict.as_object(),`
	`74`	`+identifier!(vm, update).as_str(),`
	`75`	`+(object_dict,),`
	`76`	`+)?;`
	`77`	`+}`
	`78`	`+`
	`79`	`+let attributes:Vec<_> = dict.into_iter().map(\|(k, _v)\| k).collect();`
	`80`	`+`
	`81`	`+Ok(PyList::from(attributes))`
	`82`	`+}`
`65`	`83`	`}`
`66`	`84`
`67`	`85`	`implPyObject{`

Comments

(0)