summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@gmail.com>2010-07-21 12:29:04 (GMT)
committerDoug Hellmann <doug.hellmann@gmail.com>2010-07-21 12:29:04 (GMT)
commit1c524754f67e4ba9f5e0f19e7d860d5ab2372aab (patch)
treedd00d6be393c824ba3f9da0fc0c939352b61a489 /Modules
parent6dfbff3ff3773679251876284e437be4754e1452 (diff)
downloadcpython-1c524754f67e4ba9f5e0f19e7d860d5ab2372aab.zip
cpython-1c524754f67e4ba9f5e0f19e7d860d5ab2372aab.tar.gz
cpython-1c524754f67e4ba9f5e0f19e7d860d5ab2372aab.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 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;
}