Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Module.locateFile inside _loadPackage

This commit is contained in:
Roman Yurchak 2018-09-20 11:07:45 +02:00
parent 73e3898b72
commit 6de43c9e19
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/pyodide.js
View File

@ -38,7 +38,6 @@ var languagePluginLoader = new Promise((resolve, reject) => {
let loadedPackages = window.pyodide.loadedPackages;
let queue = [].concat(names || []);
let toLoad = new Array();
window.pyodide._toLoadPackages = toLoad;
while (queue.length) {
let package_uri = queue.pop();
@ -81,6 +80,20 @@ var languagePluginLoader = new Promise((resolve, reject) => {
}
}
console.log(`Trying to load ${Object.keys(toLoad)}`);
window.pyodide._module.locateFile = (path) => {
// handle packages loaded from custom URLs
let package = path.replace(/\.data$/, "");
if (package in toLoad) {
let package_uri = toLoad[package];
if (package_uri != 'default channel') {
return package_uri.replace(/\.js$/, ".data");
};
};
return baseURL + path;
};
let promise = new Promise((resolve, reject) => {
if (Object.keys(toLoad).length === 0) {
resolve('No new packages to load');
@ -162,6 +175,7 @@ var languagePluginLoader = new Promise((resolve, reject) => {
// Rearrange namespace for public API
let PUBLIC_API = [
'loadPackage',
'loadedPackages',
'pyimport',
'repr',
'runPython',
@ -197,20 +211,7 @@ var languagePluginLoader = new Promise((resolve, reject) => {
return {};
};
Module.locateFile = (path) => {
if ((window.hasOwnProperty('pyodide')) &&
(window.pyodide.hasOwnProperty('_toLoadPackages'))) {
// handle packages loaded from custom URLs
let package = path.replace(/\.data$/, "");
if (package in window.pyodide._toLoadPackages) {
let package_uri = window.pyodide._toLoadPackages[package];
if (package_uri != 'default channel') {
return package_uri.replace(/\.js$/, ".data");
};
};
};
return baseURL + path;
};
Module.locateFile = (path) => baseURL + path;
var postRunPromise = new Promise((resolve, reject) => {
Module.postRun = () => {
delete window.Module;

2
test/conftest.py
View File

@ -112,7 +112,7 @@ class SeleniumWrapper:
except TimeoutException as exc:
_display_driver_logs(self.browser, self.driver)
print(self.logs)
raise TimeoutException()
raise TimeoutException('wait_until_packages_loaded timed out')
@property
def urls(self):