Include _bootstrap.py as str

RustPython · windelbouwman · Jun 12, 2019 · Jun 1, 2019 · Jun 5, 2019 · Jun 5, 2019
commit f1af6b1f4056ff3523ee8d4e064febbedd2d4764
diff --git a/vm/src/importlib.rs → Lib/importlib/_bootstrap.py b/vm/src/importlib.rs → 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
@@ -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<String, &'static str> {
     let mut modules = HashMap::new();
     modules.insert("__hello__".to_string(), HELLO);

diff --git 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;