Skip to content

Remove old import #1102

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
coolreader18 merged 4 commits into from
Jul 4, 2019
Merged

Remove old import #1102

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee4ee54
Use vm.import when running with -m
palaviv Jun 30, 2019
42d1713
Remove old import
palaviv Jul 3, 2019
bb30d0f
Don't install external imports if there is no compiler
palaviv Jul 4, 2019
f740845
Use vm.class
palaviv Jul 4, 2019
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
Prev Previous commit
Next Next commit
Don't install external imports if there is no compiler
  • Loading branch information
@palaviv
palaviv committed Jul 4, 2019
commit bb30d0fce0c8042f8e076eb256f44ea8b55dbc54
2 changes: 1 addition & 1 deletion vm/src/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub fn init_importlib(vm: &VirtualMachine, external: bool) -> PyResult {
vm.invoke(install, vec![vm.sys_module.clone(), impmod])?;
vm.import_func
.replace(vm.get_attribute(importlib.clone(), "__import__")?);
if external {
if external && cfg!(feature = "rustpython-compiler") {
let install_external =
vm.get_attribute(importlib.clone(), "_install_external_importers")?;
vm.invoke(install_external, vec![])?;
Expand Down