Disallow keyword arguments for type constructors that don't use them.

(fixes bug #1119418)

diff --git a/Include/modsupport.h b/Include/modsupport.h
index 2d67f3e59bbecbb0f159f80523b1a7788370e45b..bc30c3fa2157d94a09e4b56d9e07c6f676065703 100644 (file)
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -15,6 +15,7 @@ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
                                                   char *, char **, ...);
 PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, char *, int, int, ...);
 PyAPI_FUNC(PyObject *) Py_BuildValue(char *, ...);
+PyAPI_FUNC(int) _PyArg_NoKeywords(char *funcname, PyObject *kw);
 
 PyAPI_FUNC(int) PyArg_VaParse(PyObject *, char *, va_list);
 PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,

diff --git a/Misc/NEWS b/Misc/NEWS
index 7648c6547599b1cdf4b90231cbd131c9f0e3b60b..2ed650129b5a335c680608057ee12938a058a976 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.5 alpha 1?
 Core and builtins
 -----------------
 
+- Disallow keyword arguments for type constructors that don't use it
+  (fixes bug #1119418).
+
 - Forward UnicodeDecodeError into SyntaxError for source encoding errors.
 
 - SF bug #900092: When tracing (e.g. for hotshot), restore 'return' events for

diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c
index 1189036e9d737dc15a76c12342cb610a71698a9b..8fe2b2bc999fe2be9b180d4363d180d9a66f6f89 100644 (file)
--- a/Modules/_randommodule.c
+++ b/Modules/_randommodule.c
@@ -481,6 +481,9 @@ random_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        RandomObject *self;
        PyObject *tmp;
 
+       if (!_PyArg_NoKeywords("Random()", kwds))
+               return NULL;
+
        self = (RandomObject *)type->tp_alloc(type, 0);
        if (self == NULL)
                return NULL;

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 64303330012cddb43a8e4ce66050f3034c2e5cac..3c603506732778bb056f056f1ec1c7468fce6867 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1799,18 +1799,9 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        char c;
        PyObject *initial = NULL, *it = NULL;
        struct arraydescr *descr;
-
-       if (kwds != NULL) {
-               int i = PyObject_Length(kwds);
-               if (i < 0)
-                       return NULL;
-               else if (i > 0) {
-                       PyErr_SetString(PyExc_TypeError,
-                           "array.array constructor takes "
-                           "no keyword arguments");
-                       return NULL;
-               }
-       }
+       
+       if (!_PyArg_NoKeywords("array.array()", kwds))
+               return NULL;
 
        if (!PyArg_ParseTuple(args, "c|O:array", &c, &initial))
                return NULL;

diff --git a/Modules/collectionsmodule.c b/Modules/collectionsmodule.c
index 2fbd72990278d7e5f3f955da3e31b7b4ff9d7a8e..ffe1a96c6a122cdffe8e661c1258a95bbb2f4610 100644 (file)
--- a/Modules/collectionsmodule.c
+++ b/Modules/collectionsmodule.c
@@ -95,6 +95,9 @@ deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        dequeobject *deque;
        block *b;
 
+       if (!_PyArg_NoKeywords("deque()", kwds))
+               return NULL;
+
        /* create dequeobject structure */
        deque = (dequeobject *)type->tp_alloc(type, 0);
        if (deque == NULL)

diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 31ba13a3ad6dbab91290c025469a34e75fb3c8e3..34b37be43ff6369256b298418a21ed038ec78150 100644 (file)
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -618,6 +618,9 @@ cycle_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *saved;
        cycleobject *lz;
 
+       if (!_PyArg_NoKeywords("cycle()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "cycle", 1, 1, &iterable))
                return NULL;
 
@@ -765,6 +768,9 @@ dropwhile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *it;
        dropwhileobject *lz;
 
+       if (!_PyArg_NoKeywords("dropwhile()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "dropwhile", 2, 2, &func, &seq))
                return NULL;
 
@@ -906,6 +912,9 @@ takewhile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *it;
        takewhileobject *lz;
 
+       if (!_PyArg_NoKeywords("takewhile()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "takewhile", 2, 2, &func, &seq))
                return NULL;
 
@@ -1048,6 +1057,9 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        int numargs;
        isliceobject *lz;
 
+       if (!_PyArg_NoKeywords("islice()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "islice", 2, 4, &seq, &a1, &a2, &a3))
                return NULL;
 
@@ -1236,6 +1248,9 @@ starmap_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *it;
        starmapobject *lz;
 
+       if (!_PyArg_NoKeywords("starmap()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "starmap", 2, 2, &func, &seq))
                return NULL;
 
@@ -1365,6 +1380,9 @@ imap_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        imapobject *lz;
        int numargs, i;
 
+       if (!_PyArg_NoKeywords("imap()", kwds))
+               return NULL;
+
        numargs = PyTuple_Size(args);
        if (numargs < 2) {
                PyErr_SetString(PyExc_TypeError,
@@ -1544,6 +1562,9 @@ chain_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        int i;
        PyObject *ittuple;
 
+       if (!_PyArg_NoKeywords("chain()", kwds))
+               return NULL;
+
        /* obtain iterators */
        assert(PyTuple_Check(args));
        ittuple = PyTuple_New(tuplesize);
@@ -1684,6 +1705,9 @@ ifilter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *it;
        ifilterobject *lz;
 
+       if (!_PyArg_NoKeywords("ifilter()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "ifilter", 2, 2, &func, &seq))
                return NULL;
 
@@ -1825,6 +1849,9 @@ ifilterfalse_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *it;
        ifilterfalseobject *lz;
 
+       if (!_PyArg_NoKeywords("ifilterfalse()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "ifilterfalse", 2, 2, &func, &seq))
                return NULL;
 
@@ -1964,6 +1991,9 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        countobject *lz;
        long cnt = 0;
 
+       if (!_PyArg_NoKeywords("count()", kwds))
+               return NULL;
+
        if (!PyArg_ParseTuple(args, "|l:count", &cnt))
                return NULL;
 
@@ -2060,6 +2090,9 @@ izip_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *result;
        int tuplesize = PySequence_Length(args);
 
+       if (!_PyArg_NoKeywords("izip()", kwds))
+               return NULL;
+
        /* args must be a tuple */
        assert(PyTuple_Check(args));
 
@@ -2240,6 +2273,9 @@ repeat_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *element;
        long cnt = -1;
 
+       if (!_PyArg_NoKeywords("repeat()", kwds))
+               return NULL;
+
        if (!PyArg_ParseTuple(args, "O|l:repeat", &element, &cnt))
                return NULL;
 

diff --git a/Modules/operator.c b/Modules/operator.c
index 938c5e53df2704b907749db8e8f1562d1a6584bf..4e1e517f6d25097ce5ff4b995be226adbc161e1a 100644 (file)
--- a/Modules/operator.c
+++ b/Modules/operator.c
@@ -269,6 +269,9 @@ itemgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *item;
        int nitems;
 
+       if (!_PyArg_NoKeywords("itemgetter()", kwds))
+               return NULL;
+
        nitems = PyTuple_GET_SIZE(args);
        if (nitems <= 1) {
                if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &item))
@@ -405,6 +408,9 @@ attrgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject *attr;
        int nattrs;
 
+       if (!_PyArg_NoKeywords("attrgetter()", kwds))
+               return NULL;
+
        nattrs = PyTuple_GET_SIZE(args);
        if (nattrs <= 1) {
                if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &attr))

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 9630dea2644f9bfb5e236895e78fb93069d0ec2f..e445300cbf96989d92332577db38c4ec5f80c87d 100644 (file)
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -65,6 +65,9 @@ zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
        char *path, *p, *prefix, buf[MAXPATHLEN+2];
        int len;
 
+       if (!_PyArg_NoKeywords("zipimporter()", kwds))
+               return -1;
+
        if (!PyArg_ParseTuple(args, "s:zipimporter",
                              &path))
                return -1;

diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
index 674d2b562b6838c8a1e6dcdb11374520d3e3862e..da8d9fc6a25767eb5962e0d48948fc93c16597d6 100644 (file)
--- a/Objects/bufferobject.c
+++ b/Objects/bufferobject.c
@@ -192,7 +192,10 @@ buffer_new(PyTypeObject *type, PyObject *args, PyObject *kw)
        int offset = 0;
        int size = Py_END_OF_BUFFER;
 
-       if ( !PyArg_ParseTuple(args, "O|ii:buffer", &ob, &offset, &size) )
+       if (!_PyArg_NoKeywords("buffer()", kw))
+               return NULL;
+
+       if (!PyArg_ParseTuple(args, "O|ii:buffer", &ob, &offset, &size))
            return NULL;
        return PyBuffer_FromObject(ob, offset, size);
 }

diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 2f5d164d9a815e72d251f95a808bdb48f95e5445..8b5650a4fdfa9b66211eed0f2a43cec79baeac41 100644 (file)
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -45,6 +45,9 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw)
        long ilow = 0, ihigh = 0, istep = 1;
        long n;
 
+       if (!_PyArg_NoKeywords("xrange()", kw))
+               return NULL;
+
        if (PyTuple_Size(args) <= 1) {
                if (!PyArg_ParseTuple(args,
                                "l;xrange() requires 1-3 int arguments",

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 8787347617a6486141a25495aceb817c63008421..dbfa79cc3e712b393fcdafbda58a6c48a86bd2b4 100644 (file)
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -935,6 +935,9 @@ frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
        PyObject *iterable = NULL, *result;
 
+       if (!_PyArg_NoKeywords("frozenset()", kwds))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))
                return NULL;
 
@@ -976,6 +979,9 @@ PySet_Fini(void)
 static PyObject *
 set_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
+       if (!_PyArg_NoKeywords("set()", kwds))
+               return NULL;
+       
        return make_new_set(type, NULL);
 }
 

diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index c37af2b027cbd764dc963df623fb57c0b6baf2e2..f5ed8980143fd64d8c54f91b787a7909ea7c3fb5 100644 (file)
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -174,6 +174,9 @@ slice_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 
        start = stop = step = NULL;
 
+       if (!_PyArg_NoKeywords("slice()", kw))
+               return NULL;
+
        if (!PyArg_UnpackTuple(args, "slice", 1, 3, &start, &stop, &step))
                return NULL;
 

diff --git a/Python/getargs.c b/Python/getargs.c
index e89f0d587cd376e1c9bf31b0d51d38bb3458c703..483fda7d20d78d9998a77ff10cf52a6747409260 100644 (file)
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1595,3 +1595,29 @@ PyArg_UnpackTuple(PyObject *args, char *name, int min, int max, ...)
        va_end(vargs);
        return 1;
 }
+
+
+/* For type constructors that don't take keyword args
+ *
+ * Sets a TypeError and returns 0 if the kwds dict is 
+ * not emtpy, returns 1 otherwise
+ */
+int
+_PyArg_NoKeywords(char *funcname, PyObject *kw)
+{
+       if (kw == NULL)
+               return 1;
+       if (!PyDict_CheckExact(kw)) {
+               PyErr_BadInternalCall();
+               return 0;
+       }
+       if (PyDict_Size(kw) == 0)
+               return 1;
+       
+       PyErr_Format(PyExc_TypeError, "%s does not take keyword arguments", 
+                       funcname);
+       return 0;
+}
+
+
+