Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Backed out changeset 6ceedbd88b5f

This commit is contained in:
Victor Stinner 2014-05-14 17:12:27 +02:00
parent b78c448f4b
commit e1e04ad8aa
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/test/test_codecs.py
View File

@ -1600,12 +1600,6 @@ class CodecsModuleTest(unittest.TestCase):
self.assertEqual(codecs.decode(b'abc'), 'abc')
self.assertRaises(UnicodeDecodeError, codecs.decode, b'\xff', 'ascii')
# test keywords
self.assertEqual(codecs.decode(obj=b'\xe4\xf6\xfc', encoding='latin-1'),
'\xe4\xf6\xfc')
self.assertEqual(codecs.decode(b'[\xff]', 'ascii', errors='ignore'),
'[]')
def test_encode(self):
self.assertEqual(codecs.encode('\xe4\xf6\xfc', 'latin-1'),
b'\xe4\xf6\xfc')
@ -1614,12 +1608,6 @@ class CodecsModuleTest(unittest.TestCase):
self.assertEqual(codecs.encode('abc'), b'abc')
self.assertRaises(UnicodeEncodeError, codecs.encode, '\xffff', 'ascii')
# test keywords
self.assertEqual(codecs.encode(obj='\xe4\xf6\xfc', encoding='latin-1'),
b'\xe4\xf6\xfc')
self.assertEqual(codecs.encode('[\xff]', 'ascii', errors='ignore'),
b'[]')
def test_register(self):
self.assertRaises(TypeError, codecs.register)
self.assertRaises(TypeError, codecs.register, 42)

16
Modules/_codecsmodule.c
View File

@ -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},