Skip to content

Add (fake) frozenmodule __origname__ and _imp.find_frozen #4559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Feb 25, 2023
Merged

Add (fake) frozenmodule __origname__ and _imp.find_frozen #4559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f53c686
Add __origname__ to frozenlibs to fix importlib
youknowone Feb 24, 2023
10de265
Add basic _imp.find_frozen
youknowone Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add __origname__ to frozenlibs to fix importlib
  • Loading branch information
@youknowone
youknowone committed Feb 24, 2023
commit f53c68695d18a5fbd0a70623130acc5000246bd4
9 changes: 7 additions & 2 deletions vm/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ use itertools::Itertools;
use std::{env, io::prelude::*, path::PathBuf, process::Command};

fn main() {
#[cfg(feature = "freeze-stdlib")]
for entry in glob::glob("Lib/*/*.py").expect("Lib/ exists?").flatten() {
let frozen_libs = if cfg!(feature = "freeze-stdlib") {
"Lib/*/*.py"
} else {
"Lib/python_builtins/*.py"
};
for entry in glob::glob(frozen_libs).expect("Lib/ exists?").flatten() {
let display = entry.display();
println!("cargo:rerun-if-changed={display}");
}
println!("cargo:rerun-if-changed=../Lib/importlib/_bootstrap.py");

println!("cargo:rustc-env=RUSTPYTHON_GIT_HASH={}", git_hash());
println!(
Expand Down
17 changes: 11 additions & 6 deletions vm/src/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ pub(crate) fn init_importlib_base(vm: &mut VirtualMachine) -> PyResult<PyObjectR
import_builtin(vm, "_weakref")?;

let importlib = thread::enter_vm(vm, || {
let importlib = import_frozen(vm, "_frozen_importlib")?;
let impmod = import_builtin(vm, "_imp")?;
let install = importlib.get_attr("_install", vm)?;
vm.invoke(&install, (vm.sys_module.clone(), impmod))?;
Ok(importlib)
let bootstrap = import_frozen(vm, "_frozen_importlib")?;
let install = bootstrap.get_attr("_install", vm)?;
let imp = import_builtin(vm, "_imp")?;
let exc = vm.invoke(&install, (vm.sys_module.clone(), imp))?;
Ok(bootstrap)
})?;
vm.import_func = importlib.get_attr(identifier!(vm, __import__).to_owned(), vm)?;
Ok(importlib)
Expand Down Expand Up @@ -81,7 +81,12 @@ pub fn make_frozen(vm: &VirtualMachine, name: &str) -> PyResult<PyRef<PyCode>> {
}

pub fn import_frozen(vm: &VirtualMachine, module_name: &str) -> PyResult {
make_frozen(vm, module_name).and_then(|frozen| import_codeobj(vm, module_name, frozen, false))
make_frozen(vm, module_name).and_then(|frozen| {
let module = import_codeobj(vm, module_name, frozen, false)?;
// TODO: give a correct origname here
module.set_attr("__origname__", vm.ctx.new_str(module_name.to_owned()), vm)?;
Ok(module)
})
}

pub fn import_builtin(vm: &VirtualMachine, module_name: &str) -> PyResult {
Expand Down