diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
| commit | f95a1b3c53bdd678b64aa608d4375660033460c3 (patch) | |
| tree | a8bee40b1b14e28ff5978ea519f3035a3c399912 /Modules/_json.c | |
| parent | bd250300191133d276a71b395b6428081bf825b8 (diff) | |
| download | cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.zip cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.gz cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.bz2 | |
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
Diffstat (limited to 'Modules/_json.c')
| -rw-r--r-- | Modules/_json.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Modules/_json.c b/Modules/_json.c index e555439..c965176 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -511,7 +511,7 @@ py_scanstring(PyObject* self UNUSED, PyObject *args) rval = scanstring_unicode(pystr, end, strict, &next_end); } else { - PyErr_Format(PyExc_TypeError, + PyErr_Format(PyExc_TypeError, "first argument must be a string or bytes, not %.80s", Py_TYPE(pystr)->tp_name); return NULL; @@ -1394,7 +1394,7 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss if (PyObject_IsTrue(s->sort_keys)) { if (code == NULL) { - code = Py_CompileString("sorted(d.items(), key=lambda kv: kv[0])", + code = Py_CompileString("sorted(d.items(), key=lambda kv: kv[0])", "_json.c", Py_eval_input); if (code == NULL) goto bail; @@ -1409,14 +1409,14 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss } items = PyEval_EvalCode((PyCodeObject *)code, PyEval_GetGlobals(), mapping); Py_DECREF(mapping); - } else { + } else { items = PyMapping_Items(dct); - } - if (items == NULL) + } + if (items == NULL) goto bail; it = PyObject_GetIter(items); - Py_DECREF(items); - if (it == NULL) + Py_DECREF(items); + if (it == NULL) goto bail; skipkeys = PyObject_IsTrue(s->skipkeys); idx = 0; @@ -1437,8 +1437,8 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss goto bail; } else if (key == Py_True || key == Py_False || key == Py_None) { - /* This must come before the PyLong_Check because - True and False are also 1 and 0.*/ + /* This must come before the PyLong_Check because + True and False are also 1 and 0.*/ kstr = _encoded_const(key); if (kstr == NULL) goto bail; @@ -1704,15 +1704,15 @@ PyDoc_STRVAR(module_doc, "json speedups\n"); static struct PyModuleDef jsonmodule = { - PyModuleDef_HEAD_INIT, - "_json", - module_doc, - -1, - speedups_methods, - NULL, - NULL, - NULL, - NULL + PyModuleDef_HEAD_INIT, + "_json", + module_doc, + -1, + speedups_methods, + NULL, + NULL, + NULL, + NULL }; PyObject* |