From 1ee57cbd16f0fdc63e6ab0eb79a75811b1b42528 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 14 Feb 2019 16:59:54 -0500 Subject: [PATCH] Fix broken merge --- src/pyodide.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/pyodide.js b/src/pyodide.js index 4725b224a..c6e03f6cd 100644 --- a/src/pyodide.js +++ b/src/pyodide.js @@ -370,13 +370,8 @@ var languagePluginLoader = new Promise((resolve, reject) => { document.getElementsByTagName('head')[0].appendChild(link); // Add a custom output handler for Python objects -<<<<<<< HEAD - self.iodide.addOutputHandler({ - shouldHandle : (val) => { -======= - window.iodide.addOutputRenderer({ + self.iodide.addOutputRenderer({ shouldRender : (val) => { ->>>>>>> Update for new Iodide renderer API return (typeof val === 'function' && pyodide._module.PyProxy.isPyProxy(val)); },