summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-04 11:40:53 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-04 11:40:53 (GMT)
commitdf8a8f768d929b56e43c42299064e7bcaebee4c7 (patch)
treeb3295fda05fda171dcdeec204249a88922b79809 /Modules
parent1602ec109b8f4a9b2e015359e3674d6e5bb8f07c (diff)
downloadcpython-df8a8f768d929b56e43c42299064e7bcaebee4c7.zip
cpython-df8a8f768d929b56e43c42299064e7bcaebee4c7.tar.gz
cpython-df8a8f768d929b56e43c42299064e7bcaebee4c7.tar.bz2
#11982: fix json.loads('""') to return u'' rather than ''.
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 71d3e58..8d63edb 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -595,7 +595,7 @@ scanstring_str(PyObject *pystr, Py_ssize_t end, char *encoding, int strict, Py_s
Py_DECREF(chunk);
}
- rval = join_list_string(chunks);
+ rval = join_list_unicode(chunks);
if (rval == NULL) {
goto bail;
}