Convert non-string errors into JSON text

2 files changed, 6 insertions, 4 deletions

diff --git a/jq.pyx b/jq.pyx
index c0a9c09..1b2056c 100644
--- a/jq.pyx
+++ b/jq.pyx
@@ -183,13 +183,15 @@ cdef void _store_error(void* store_ptr, jv error) noexcept:
 
 
 cdef unicode _jq_error_to_py_string(jv error) noexcept:
+    error = jv_copy(error)
+
     if jv_get_kind(error) == JV_KIND_STRING:
         try:
             return jv_string_to_py_string(error)
         except:
             return u"Internal error"
     else:
-        return u"(not a string)"
+        return json.dumps(_jv_to_python(error))
 
 
 cdef class _ErrorStore(object):
diff --git a/tests/jq_tests.py b/tests/jq_tests.py
index 69c37df..c42c862 100644
--- a/tests/jq_tests.py
+++ b/tests/jq_tests.py
@@ -217,13 +217,13 @@ def test_value_error_is_raised_if_input_cannot_be_processed_by_program():
         assert_equal(str(error), expected_error_str)
 
 
-def test_non_string_error_is_converted_to_generic_string():
+def test_non_string_error_is_converted_to_json_text():
     program = jq.compile("error")
     try:
-        program.input(1).all()
+        program.input({"x": 1}).all()
         assert False, "Expected error"
     except ValueError as error:
-        expected_error_str = "(not a string)"
+        expected_error_str = '{"x": 1}'
         assert_equal(str(error), expected_error_str)