traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 83016 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83016 | doug.hellmann | 2010-07-21 08:29:04 -0400 (Wed, 21 Jul 2010) | 1 line

  Apply patch from Ray Allen for issue 9296
........
This commit is contained in:
Doug Hellmann 2010-07-21 12:35:38 +00:00
parent b034c75495
commit 76e57947a1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/json/tests/test_fail.py
View File

@ -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)

2
Modules/_json.c
View File

@ -1454,7 +1454,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;
} }