diff --git a/vm/src/importlib.rs b/Lib/importlib/_bootstrap.py similarity index 99% rename from vm/src/importlib.rs rename to Lib/importlib/_bootstrap.py index 7b8b4e81b..32deef10a 100644 --- a/vm/src/importlib.rs +++ b/Lib/importlib/_bootstrap.py @@ -1,4 +1,3 @@ -pub const IMPORTLIB_BOOTSTRAP: &str = r#" """Core implementation of import. This module is NOT meant to be directly imported! It has been designed such @@ -1172,4 +1171,3 @@ def _install_external_importers(): import _frozen_importlib_external _bootstrap_external = _frozen_importlib_external _frozen_importlib_external._install(sys.modules[__name__]) -"#; diff --git a/vm/src/frozen.rs b/vm/src/frozen.rs index 36fd08a4a..41848001d 100644 --- a/vm/src/frozen.rs +++ b/vm/src/frozen.rs @@ -1,10 +1,21 @@ -use crate::importlib::IMPORTLIB_BOOTSTRAP; use std::collections::hash_map::HashMap; const HELLO: &str = "initialized = True print(\"Hello world!\") "; +const IMPORTLIB_BOOTSTRAP: &'static str = include_str!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/", + "..", + "/", + "Lib", + "/", + "importlib", + "/", + "_bootstrap.py" +)); + pub fn get_module_inits() -> HashMap { let mut modules = HashMap::new(); modules.insert("__hello__".to_string(), HELLO); diff --git a/vm/src/lib.rs b/vm/src/lib.rs index d52823c3d..24f28709e 100644 --- a/vm/src/lib.rs +++ b/vm/src/lib.rs @@ -48,7 +48,6 @@ pub mod frame; mod frozen; pub mod function; pub mod import; -mod importlib; pub mod obj; mod pyhash; pub mod pyobject;