BUGFIX: If python2js_buffer fails, python2js leaves the error flag in…

… an invalid state (pyodide#1111)
jmsmdy · Jan 12, 2021 · 2266ccf · 2266ccf
1 parent f6a67d9
commit 2266ccf
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/packages/numpy/test_numpy.py b/packages/numpy/test_numpy.py
@@ -109,6 +109,21 @@ def assert_equal():
     assert selenium.run_js("return pyodide.pyimport('x')[1][1]") == "string4"
 
 
+def test_py2js_buffer_clear_error_flag(selenium):
+    selenium.load_package("numpy")
+    selenium.run("import numpy as np")
+    selenium.run("x = np.array([['string1', 'string2'], ['string3', 'string4']])")
+    assert (
+        selenium.run_js(
+            """
+            pyodide.globals.x
+            return pyodide._module._PyErr_Occurred();
+            """
+        )
+        == 0
+    )
+
+
 def test_python2js_numpy_scalar(selenium_standalone):
     selenium = selenium_standalone
 

diff --git a/src/core/python2js.c b/src/core/python2js.c
@@ -262,6 +262,7 @@ _python2js(PyObject* x, PyObject* map)
     if (ret != NULL) {
       return ret;
     }
+    PyErr_Clear();
     if (PySequence_Check(x)) {
       return _python2js_sequence(x, map);
     }

diff --git a/src/tests/test_typeconversions.py b/src/tests/test_typeconversions.py
@@ -327,3 +327,20 @@ def test_javascript_error_back_to_js(selenium):
         return pyodide.globals["py_err"] === err
         """
     )
+
+
+def test_memoryview_conversion(selenium):
+    selenium.run(
+        """
+        import array
+        a = array.array("Q", [1,2,3])
+        """
+    )
+    selenium.run_js(
+        """
+        pyodide.globals.a
+        if(pyodide._module._PyErr_Occurred()){
+            pyodide._module._pythonexc2js();
+        }
+        """
+    )