Commit883a494

authored

Merge pull requestRustPython#598 from palaviv/dir-module

Fix module dir

2 parentsa264017 +2d31e35 commit883a494Copy full SHA for 883a494

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 12 additions & 0 deletions

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ use super::objdict;`
`2`	`2`	`usesuper::objstr;`
`3`	`3`	`usesuper::objtype;// Required for arg_check! to use isinstance`
`4`	`4`	`usecrate::pyobject::{`
`5`		`-AttributeProtocol,IdProtocol,PyAttributes,PyContext,PyFuncArgs,PyObject,PyObjectPayload,`
`6`		`-PyObjectRef,PyResult,TypeProtocol,`
	`5`	`+AttributeProtocol,DictProtocol,IdProtocol,PyAttributes,PyContext,PyFuncArgs,PyObject,`
	`6`	`+PyObjectPayload,PyObjectRef,PyResult,TypeProtocol,`
`7`	`7`	`};`
`8`	`8`	`usecrate::vm::VirtualMachine;`
`9`	`9`	`use std::cell::RefCell;`
`@@ -277,6 +277,13 @@ pub fn get_attributes(obj: &PyObjectRef) -> PyAttributes {`
`277`	`277`	`attributes.insert(name.to_string(), value.clone());`
`278`	`278`	`}`
`279`	`279`	`}`
	`280`	`+`
	`281`	`+// Get module attributes:`
	`282`	`+ifletPyObjectPayload::Module{ref scope, ..} =&obj.payload{`
	`283`	`+for(name, value)in scope.locals.get_key_value_pairs().iter(){`
	`284`	`+ attributes.insert(objstr::get_value(name).to_string(), value.clone());`
	`285`	`+}`
	`286`	`+}`
`280`	`287`	`attributes`
`281`	`288`	`}`
`282`	`289`

Comments

(0)