diff options
| author | Doug Hellmann <doug.hellmann@gmail.com> | 2010-07-21 12:35:38 (GMT) |
|---|---|---|
| committer | Doug Hellmann <doug.hellmann@gmail.com> | 2010-07-21 12:35:38 (GMT) |
| commit | 76e57947a10466654f09b696886eae5ff245e550 (patch) | |
| tree | 850b6cbcb71693b8f3e4d2c50c8228991f4ff425 /Modules/_json.c | |
| parent | b034c75495cf033b3ec7a1b6ea6b1f4c1338ecb4 (diff) | |
| download | cpython-76e57947a10466654f09b696886eae5ff245e550.zip cpython-76e57947a10466654f09b696886eae5ff245e550.tar.gz cpython-76e57947a10466654f09b696886eae5ff245e550.tar.bz2 | |
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
........
Diffstat (limited to 'Modules/_json.c')
| -rw-r--r-- | Modules/_json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_json.c b/Modules/_json.c index c965176..9a3708d 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -1454,7 +1454,7 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss } else { /* 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; } |