x

Author: youknowone

crates/vm/src/frame.rs

@@ -2383,7 +2383,7 @@ impl ExecutingFrame<'_> {
         let mod_name_obj = module.get_attr(identifier!(vm, __name__), vm).ok();
         let mod_name_str = mod_name_obj
             .as_ref()
-            .and_then(|n| n.downcast_ref::<PyStr>().map(|s| s.as_wtf8().to_string()));
+            .and_then(|n| n.downcast_ref::<PyStr>().map(|s| s.expect_str().to_owned()));
         let module_name = mod_name_str.as_deref().unwrap_or("<unknown module name>");
 
         let spec = module
@@ -2442,7 +2442,7 @@ impl ExecutingFrame<'_> {
                 format!("cannot import name '{name}' from '{module_name}' (unknown location)")
             }
         };
-        let err = vm.new_import_error(msg, vm.ctx.new_str(module_name));
+        let err = vm.new_import_error(msg, vm.ctx.new_utf8_str(module_name));
 
         if let Some(ref path) = origin {
             let _ignore = err

crates/vm/src/import.rs

@@ -593,7 +593,7 @@ fn calc_package(globals: Option<&PyObjectRef>, vm: &VirtualMachine) -> PyResult<
     let mod_name = globals.get_item("__name__", vm).map_err(|_| {
         vm.new_import_error(
             "attempted relative import with no known parent package".to_owned(),
-            vm.ctx.new_str(""),
+            vm.ctx.new_utf8_str(""),
         )
     })?;
     let mod_name_str: PyStrRef = mod_name