traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix TODO: do the sort by just the key, not the key/value pair.

This commit is contained in:
Raymond Hettinger 2009-05-27 11:19:02 +00:00
parent bcf6f92dc5
commit 491a4cb8d9
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Modules/_json.c
View File

@ -1339,6 +1339,8 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss
PyObject *item = NULL;
int skipkeys;
Py_ssize_t idx;
PyObject *mapping;
static PyObject *code = NULL;
if (open_dict == NULL || close_dict == NULL || empty_dict == NULL) {
open_dict = PyUnicode_InternFromString("{");
@ -1379,25 +1381,28 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss
*/
}
items = PyObject_CallMethod(dct, "items", ""); /* XXX key=itemgetter(0) */
if (PyObject_IsTrue(s->sort_keys)) {
if (code == NULL) {
code = Py_CompileString("sorted(d.items(), key=lambda kv: kv[0])",
"_json.c", Py_eval_input);
if (code == NULL)
goto bail;
}
mapping = PyDict_New();
if (mapping == NULL)
goto bail;
if (PyDict_SetItemString(mapping, "d", dct) == -1) {
Py_DECREF(mapping);
goto bail;
}
items = PyEval_EvalCode((PyCodeObject *)code, PyEval_GetGlobals(), mapping);
Py_DECREF(mapping);
} else {
items = PyMapping_Items(dct);
}
if (items == NULL)
goto bail;
if (PyObject_IsTrue(s->sort_keys)) {
PyObject *rv;
PyObject *itemlist;
itemlist = PySequence_List(items);
Py_DECREF(items);
if (itemlist == NULL)
goto bail;
rv = PyObject_CallMethod(itemlist, "sort", "");
if (rv == NULL) {
Py_DECREF(itemlist);
goto bail;
}
items = itemlist;
}
it = PyObject_GetIter(items);
Py_DECREF(items);
if (it == NULL)