diff options
| author | Georg Brandl <georg@python.org> | 2005-08-26 06:42:30 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2005-08-26 06:42:30 (GMT) |
| commit | 02c42871cf73365dc5b6915cac2b017b2b90c81f (patch) | |
| tree | a85d3fb2fc3682c2a149d213f5cf9a378868abea /Python/getargs.c | |
| parent | bd77da6dab9d41ef246febf54c7928ce4496dd49 (diff) | |
| download | cpython-02c42871cf73365dc5b6915cac2b017b2b90c81f.zip cpython-02c42871cf73365dc5b6915cac2b017b2b90c81f.tar.gz cpython-02c42871cf73365dc5b6915cac2b017b2b90c81f.tar.bz2 | |
Disallow keyword arguments for type constructors that don't use them.
(fixes bug #1119418)
Diffstat (limited to 'Python/getargs.c')
| -rw-r--r-- | Python/getargs.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/Python/getargs.c b/Python/getargs.c index e89f0d5..483fda7 100644 --- 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; +} + + + |