Modules have attributes, not items.

cthulahoops · cthulahoops · commit e59b735ba40b · 2019-03-26T17:07:20.000Z
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -47,11 +47,11 @@ fn import_uncached_module(vm: &VirtualMachine, current_path: PathBuf, module: &s
 pub fn import_module(vm: &VirtualMachine, current_path: PathBuf, module_name: &str) -> PyResult {
     // First, see if we already loaded the module:
     let sys_modules = vm.get_attribute(vm.sys_module.clone(), "modules")?;
-    if let Some(module) = sys_modules.get_item(module_name) {
+    if let Ok(module) = vm.get_attribute(sys_modules.clone(), module_name) {
         return Ok(module);
     }
     let module = import_uncached_module(vm, current_path, module_name)?;
-    sys_modules.set_item(&vm.ctx, module_name, module.clone());
+    vm.ctx.set_attr(&sys_modules, module_name, module.clone());
     Ok(module)
 }
 
diff --git a/vm/src/stdlib/json.rs b/vm/src/stdlib/json.rs
@@ -199,8 +199,7 @@ pub fn de_pyobject(vm: &VirtualMachine, s: &str) -> PyResult {
     de.deserialize(&mut serde_json::Deserializer::from_str(s))
         .map_err(|err| {
             let json_decode_error = vm
-                .sys_module
-                .get_item("modules")
+                .get_attribute(vm.sys_module.clone(), "modules")
                 .unwrap()
                 .get_item("json")
                 .unwrap()

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,11 @@ fn import_uncached_module(vm: &VirtualMachine, current_path: PathBuf, module: &s`
`47`	`47`	`pub fn import_module(vm: &VirtualMachine, current_path: PathBuf, module_name: &str) -> PyResult {`
`48`	`48`	`// First, see if we already loaded the module:`
`49`	`49`	`let sys_modules = vm.get_attribute(vm.sys_module.clone(), "modules")?;`
`50`		`- if let Some(module) = sys_modules.get_item(module_name) {`
	`50`	`+ if let Ok(module) = vm.get_attribute(sys_modules.clone(), module_name) {`
`51`	`51`	`return Ok(module);`
`52`	`52`	`}`
`53`	`53`	`let module = import_uncached_module(vm, current_path, module_name)?;`
`54`		`- sys_modules.set_item(&vm.ctx, module_name, module.clone());`
	`54`	`+ vm.ctx.set_attr(&sys_modules, module_name, module.clone());`
`55`	`55`	`Ok(module)`
`56`	`56`	`}`
`57`	`57`