mirror of
https://github.com/RustPython/RustPython.git
synced 2026-10-28 18:59:04 +08:00
Add basic _imp.find_frozen
This commit is contained in:
1 parent
f53c68695d
commit
10de265b4f
3 files changed
+58
-3
No files matched your search
@@ -65,6 +65,7 @@
|
||||
"PYTHONWARNINGS",
|
||||
"basicsize",
|
||||
"itemsize",
|
||||
"origname",
|
||||
"getattro",
|
||||
"setattro",
|
||||
"iternext",
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ pub(crate) fn init_importlib_base(vm: &mut VirtualMachine) -> PyResult<PyObjectR
|
||||
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))?;
|
||||
vm.invoke(&install, (vm.sys_module.clone(), imp))?;
|
||||
Ok(bootstrap)
|
||||
})?;
|
||||
vm.import_func = importlib.get_attr(identifier!(vm, __import__).to_owned(), vm)?;
|
||||
|
||||
+56
-2
@@ -1,4 +1,4 @@
|
||||
use crate::{PyObjectRef, VirtualMachine};
|
||||
use crate::{builtins::PyBaseExceptionRef, bytecode::FrozenModule, PyObjectRef, VirtualMachine};
|
||||
|
||||
pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
|
||||
let module = _imp::make_module(vm);
|
||||
@@ -48,10 +48,40 @@ mod lock {
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
enum FrozenError {
|
||||
BadName, // The given module name wasn't valid.
|
||||
NotFound, // It wasn't in PyImport_FrozenModules.
|
||||
Disabled, // -X frozen_modules=off (and not essential)
|
||||
Excluded, // The PyImport_FrozenModules entry has NULL "code"
|
||||
// (module is present but marked as unimportable, stops search).
|
||||
Invalid, // The PyImport_FrozenModules entry is bogus
|
||||
// (eg. does not contain executable code).
|
||||
}
|
||||
|
||||
impl FrozenError {
|
||||
fn to_pyexception(&self, mod_name: &str, vm: &VirtualMachine) -> PyBaseExceptionRef {
|
||||
use FrozenError::*;
|
||||
let msg = match self {
|
||||
BadName | NotFound => format!("No such frozen object named {mod_name}"),
|
||||
Disabled => format!("Frozen modules are disabled and the frozen object named {mod_name} is not essential"),
|
||||
Excluded => format!("Excluded frozen object named {mod_name}"),
|
||||
Invalid => format!("Frozen object named {mod_name} is invalid"),
|
||||
};
|
||||
vm.new_import_error(msg, mod_name)
|
||||
}
|
||||
}
|
||||
|
||||
// find_frozen in frozen.c
|
||||
fn find_frozen<'a>(name: &str, vm: &'a VirtualMachine) -> Result<&'a FrozenModule, FrozenError> {
|
||||
vm.state.frozen.get(name).ok_or(FrozenError::NotFound)
|
||||
}
|
||||
|
||||
#[pymodule]
|
||||
mod _imp {
|
||||
use crate::{
|
||||
builtins::{PyBytesRef, PyCode, PyModule, PyStrRef},
|
||||
builtins::{PyBytesRef, PyCode, PyMemoryView, PyModule, PyStrRef},
|
||||
function::OptionalArg,
|
||||
import, PyObjectRef, PyRef, PyResult, TryFromObject, VirtualMachine,
|
||||
};
|
||||
|
||||
@@ -126,6 +156,30 @@ mod _imp {
|
||||
// TODO:
|
||||
}
|
||||
|
||||
#[allow(clippy::type_complexity)]
|
||||
#[pyfunction]
|
||||
fn find_frozen(
|
||||
name: PyStrRef,
|
||||
withdata: OptionalArg<bool>,
|
||||
vm: &VirtualMachine,
|
||||
) -> PyResult<Option<(Option<PyRef<PyMemoryView>>, bool, PyStrRef)>> {
|
||||
use super::FrozenError::*;
|
||||
|
||||
if withdata.into_option().is_some() {
|
||||
// this is keyword-only argument in CPython
|
||||
unimplemented!();
|
||||
}
|
||||
|
||||
let info = match super::find_frozen(name.as_str(), vm) {
|
||||
Ok(info) => info,
|
||||
Err(NotFound | Disabled | BadName) => return Ok(None),
|
||||
Err(e) => return Err(e.to_pyexception(name.as_str(), vm)),
|
||||
};
|
||||
|
||||
let origname = name; // FIXME: origname != name
|
||||
Ok(Some((None, info.package, origname)))
|
||||
}
|
||||
|
||||
#[pyfunction]
|
||||
fn source_hash(key: u64, source: PyBytesRef) -> Vec<u8> {
|
||||
let hash: u64 = crate::common::hash::keyed_hash(key, source.as_bytes());
|
||||
|
||||
Reference in new issue
Block a user