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

Fix broken merge

This commit is contained in:
Michael Droettboom 2019-02-14 16:59:54 -05:00
parent 7a496116e8
commit 1ee57cbd16
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pyodide.js
View File

@ -370,13 +370,8 @@ var languagePluginLoader = new Promise((resolve, reject) => {
document.getElementsByTagName('head')[0].appendChild(link); document.getElementsByTagName('head')[0].appendChild(link);
// Add a custom output handler for Python objects // Add a custom output handler for Python objects
<<<<<<< HEAD self.iodide.addOutputRenderer({
self.iodide.addOutputHandler({
shouldHandle : (val) => {
=======
window.iodide.addOutputRenderer({
shouldRender : (val) => { shouldRender : (val) => {
>>>>>>> Update for new Iodide renderer API
return (typeof val === 'function' && return (typeof val === 'function' &&
pyodide._module.PyProxy.isPyProxy(val)); pyodide._module.PyProxy.isPyProxy(val));
}, },