Merge aa6f4ae into 67704c9

src/conversions.c

@@ -63,23 +63,23 @@ static duk_ret_t python_function_caller(duk_context *ctx)
         err_occured = PyErr_Occurred() != NULL;
         get_repr(func, buf1, 200);
         if (!err_occured) {
+            get_repr(func, buf1, 200);
             if (gil_acquired) {
                 dctx->py_thread_state = PyEval_SaveThread();
                 gil_acquired = 0;
             }
-            get_repr(func, buf1, 200);
-            duk_error(ctx, DUK_ERR_ERROR, "Function (%s) failed", buf1);
+            return duk_error(ctx, DUK_ERR_ERROR, "Function (%s) failed", buf1);
         }
         PyErr_Fetch(&ptype, &pval, &tb);
         if (!get_repr(pval, buf2, 1024)) get_repr(ptype, buf2, 1024);
         Py_XDECREF(ptype); Py_XDECREF(pval); Py_XDECREF(tb);
         PyErr_Clear();  /* In case there was an error in get_repr() */
+        get_repr(func, buf1, 200);
         if (gil_acquired) {
             dctx->py_thread_state = PyEval_SaveThread();
             gil_acquired = 0;
         }
-        get_repr(func, buf1, 200);
-        duk_error(ctx, DUK_ERR_ERROR, "Function (%s) failed with error: %s", buf1, buf2);
+        return duk_error(ctx, DUK_ERR_ERROR, "Function (%s) failed with error: %s", buf1, buf2);
 
     }
     python_to_duk(ctx, result);

tests.py

@@ -28,6 +28,21 @@ def test_eval(self):
     def test_eval_file(self):
         pass
 
+    def test_pyfunc_success(self):
+        self.g.foo = lambda x: 213 + x
+        result = self.ctx.eval('foo(3)')
+        self.assertEqual(result, 213 + 3)
+
+    def test_pyfunc_exception(self):
+        def throw_exception():
+            raise ValueError('failure!')
+
+        self.g.throw_exception = throw_exception
+        with self.assertRaises(JSError) as err_ctx:
+            self.ctx.eval('throw_exception()')
+        self.assertIn("ValueError('failure!'",
+            err_ctx.exception.args[0]['message'])
+
     def test_undefined(self):
         self.assertEqual(repr(undefined), 'undefined')