[Python-checkins] python/dist/src/Objects rangeobject.c, 2.53, 2.53.2.1 setobject.c, 1.31.2.3, 1.31.2.4 bufferobject.c, 2.26, 2.26.2.1 sliceobject.c, 2.22, 2.22.4.1
birkenfeld@users.sourceforge.net
birkenfeld at users.sourceforge.net
Fri Aug 26 08:43:27 CEST 2005
Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18531/Objects
Modified Files:
Tag: release24-maint
rangeobject.c setobject.c bufferobject.c sliceobject.c
Log Message:
Disallow keyword arguments for type constructors that don't use them
(fixes #1119418).
Index: rangeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/rangeobject.c,v
retrieving revision 2.53
retrieving revision 2.53.2.1
diff -u -d -r2.53 -r2.53.2.1
--- rangeobject.c 8 Aug 2004 07:17:39 -0000 2.53
+++ rangeobject.c 26 Aug 2005 06:43:16 -0000 2.53.2.1
@@ -90,6 +90,9 @@
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",
Index: setobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -d -r1.31.2.3 -r1.31.2.4
--- setobject.c 13 Aug 2005 02:28:54 -0000 1.31.2.3
+++ setobject.c 26 Aug 2005 06:43:16 -0000 1.31.2.4
@@ -81,6 +81,9 @@
{
PyObject *iterable = NULL;
+ if (!_PyArg_NoKeywords("frozenset()", kwds))
+ return NULL;
+
if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))
return NULL;
if (iterable != NULL && PyFrozenSet_CheckExact(iterable)) {
@@ -93,6 +96,9 @@
static PyObject *
set_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
+ if (!_PyArg_NoKeywords("set()", kwds))
+ return NULL;
+
return make_new_set(type, NULL);
}
Index: bufferobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v
retrieving revision 2.26
retrieving revision 2.26.2.1
diff -u -d -r2.26 -r2.26.2.1
--- bufferobject.c 24 Sep 2004 19:17:26 -0000 2.26
+++ bufferobject.c 26 Aug 2005 06:43:16 -0000 2.26.2.1
@@ -192,7 +192,10 @@
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);
}
Index: sliceobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/sliceobject.c,v
retrieving revision 2.22
retrieving revision 2.22.4.1
diff -u -d -r2.22 -r2.22.4.1
--- sliceobject.c 5 Sep 2003 14:27:30 -0000 2.22
+++ sliceobject.c 26 Aug 2005 06:43:16 -0000 2.22.4.1
@@ -174,6 +174,9 @@
start = stop = step = NULL;
+ if (!_PyArg_NoKeywords("slice()", kw))
+ return NULL;
+
if (!PyArg_UnpackTuple(args, "slice", 1, 3, &start, &stop, &step))
return NULL;
More information about the Python-checkins
mailing list