Backed out changeset 6ceedbd88b5f

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 5aa2140ceefca34a7bf67607f9346bed6c4ebf81..9b62d5b12f12db5dd81b26662805ca7f9e2f0e67 100644 (file)
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -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)

diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 1b21300c8d594183a7665424a22d7aa2f3cf59d3..0b093ab19fcbca330e45d905de2e54c6e0b52577 100644 (file)
--- 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},