summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@gmail.com>2010-07-21 12:36:33 (GMT)
committerDoug Hellmann <doug.hellmann@gmail.com>2010-07-21 12:36:33 (GMT)
commitf31db93fc1239a6d9c2fe61c73ba9303005208e1 (patch)
tree10da07135e4a337be18c79c3883f69ac95e97e77 /Modules
parent8c4fa1159173b3c8dc59f4cf1e73419eb2128961 (diff)
downloadcpython-f31db93fc1239a6d9c2fe61c73ba9303005208e1.zip
cpython-f31db93fc1239a6d9c2fe61c73ba9303005208e1.tar.gz
cpython-f31db93fc1239a6d9c2fe61c73ba9303005208e1.tar.bz2
Apply patch from Ray Allen for issue 9296
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_json.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_json.c b/Modules/_json.c
index b6599f8..2ef66e3 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -2147,7 +2147,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;
}