Commit f31db93f authored by Doug Hellmann's avatar Doug Hellmann

Apply patch from Ray Allen for issue 9296

parent 8c4fa115
...@@ -74,3 +74,12 @@ class TestFail(TestCase): ...@@ -74,3 +74,12 @@ class TestFail(TestCase):
pass pass
else: else:
self.fail("Expected failure for fail{0}.json: {1!r}".format(idx, doc)) self.fail("Expected failure for fail{0}.json: {1!r}".format(idx, doc))
def test_non_string_keys_dict(self):
data = {'a' : 1, (1, 2) : 2}
#This is for c encoder
self.assertRaises(TypeError, json.dumps, data)
#This is for python encoder
self.assertRaises(TypeError, json.dumps, data, indent=True)
...@@ -2147,7 +2147,7 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss ...@@ -2147,7 +2147,7 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss
} }
else { else {
/* TODO: include repr of key */ /* TODO: include repr of key */
PyErr_SetString(PyExc_ValueError, "keys must be a string"); PyErr_SetString(PyExc_TypeError, "keys must be a string");
goto bail; goto bail;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment