diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-05-14 15:12:27 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-05-14 15:12:27 (GMT) |
| commit | e1e04ad8aac819941948b994937f1d42d83a564b (patch) | |
| tree | 971a16b95e08f942c596829e1630087b34a8b985 /Modules | |
| parent | b78c448f4bad3afee409129337709e5fb110e5f3 (diff) | |
| download | cpython-e1e04ad8aac819941948b994937f1d42d83a564b.zip cpython-e1e04ad8aac819941948b994937f1d42d83a564b.tar.gz cpython-e1e04ad8aac819941948b994937f1d42d83a564b.tar.bz2 | |
Backed out changeset 6ceedbd88b5f
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_codecsmodule.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index 1b21300..0b093ab 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -89,15 +89,13 @@ a ValueError. Other possible values are 'ignore', 'replace' and\n\ codecs.register_error that can handle ValueErrors."); static PyObject * -codec_encode(PyObject *self, PyObject *args, PyObject *kwargs) +codec_encode(PyObject *self, PyObject *args) { - static char *kwlist[] = {"obj", "encoding", "errors", NULL}; const char *encoding = NULL; const char *errors = NULL; PyObject *v; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|ss:encode", kwlist, - &v, &encoding, &errors)) + if (!PyArg_ParseTuple(args, "O|ss:encode", &v, &encoding, &errors)) return NULL; if (encoding == NULL) @@ -118,15 +116,13 @@ as well as any other name registered with codecs.register_error that is\n\ able to handle ValueErrors."); static PyObject * -codec_decode(PyObject *self, PyObject *args, PyObject *kwargs) +codec_decode(PyObject *self, PyObject *args) { - static char *kwlist[] = {"obj", "encoding", "errors", NULL}; const char *encoding = NULL; const char *errors = NULL; PyObject *v; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|ss:decode", kwlist, - &v, &encoding, &errors)) + if (!PyArg_ParseTuple(args, "O|ss:decode", &v, &encoding, &errors)) return NULL; if (encoding == NULL) @@ -1124,9 +1120,9 @@ static PyMethodDef _codecs_functions[] = { register__doc__}, {"lookup", codec_lookup, METH_VARARGS, lookup__doc__}, - {"encode", (PyCFunction)codec_encode, METH_VARARGS|METH_KEYWORDS, + {"encode", codec_encode, METH_VARARGS, encode__doc__}, - {"decode", (PyCFunction)codec_decode, METH_VARARGS|METH_KEYWORDS, + {"decode", codec_decode, METH_VARARGS, decode__doc__}, {"escape_encode", escape_encode, METH_VARARGS}, {"escape_decode", escape_decode, METH_VARARGS}, |