[Python-checkins] cpython (3.4): Backed out changeset 6ceedbd88b5f
victor.stinner
python-checkins at python.org
Wed May 14 17:13:57 CEST 2014
http://hg.python.org/cpython/rev/36bc19c78270
changeset: 90701:36bc19c78270
branch: 3.4
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed May 14 17:12:27 2014 +0200
summary:
Backed out changeset 6ceedbd88b5f
files:
Lib/test/test_codecs.py | 12 ------------
Modules/_codecsmodule.c | 16 ++++++----------
2 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1600,12 +1600,6 @@
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 @@
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)
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -89,15 +89,13 @@
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 @@
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 @@
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},
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list