Mercurial > pymonkey

changeset 124:3613bc5dba3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a TODO.
author Atul Varma <varmaa@toolness.com>
date Wed, 19 Aug 2009 07:26:20 -0700
parents 08a012e96f62
children 05e18059b5c4
files src/utils.cpp
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/utils.cpp	Wed Aug 19 01:00:35 2009 -0700
+++ b/src/utils.cpp	Wed Aug 19 07:26:20 2009 -0700
@@ -252,9 +252,10 @@
 
     if (str != NULL)
       pyStr = PYM_jsvalToPyObject(context, STRING_TO_JSVAL(str));
-    else
-      // TODO: Is there an exception in JS-land we should clear?
+    else {
+      JS_ClearPendingException(context->cx);
       pyStr = PyString_FromString("<string conversion failed>");
+    }
 
     if (pyStr) {
       tuple = Py_BuildValue("(OO)", obj, pyStr);