Mercurial > cpython-lru_cache-weakref
diff Modules/_json.c @ 63123:70925d3c0279 3.1
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
........
| author | Doug Hellmann <doug.hellmann@gmail.com> |
|---|---|
| date | Wed, 21 Jul 2010 12:35:38 +0000 |
| parents | f197407bdba2 |
| children | 4874efd1f657 |
line wrap: on
line diff
--- a/Modules/_json.c Wed Jul 21 09:50:42 2010 +0000 +++ b/Modules/_json.c Wed Jul 21 12:35:38 2010 +0000 @@ -1454,7 +1454,7 @@ } 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; }
