Mailman 3 August 2005 - Python-checkins

python/dist/src/Misc NEWS, 1.1193.2.87, 1.1193.2.88
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7366/Misc Modified Files: Tag: release24-maint NEWS Log Message: backport patch [ 756021 ] Allow socket.inet_aton("255.255.255.255") on Windows Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.87 retrieving revision 1.1193.2.88 diff -u -d -r1.1193.2.87 -r1.1193.2.88 --- NEWS 26 Aug 2005 06:43:16 -0000 1.1193.2.87 +++ NEWS 26 Aug 2005 08:33:28 -0000 1.1193.2.88 @@ -55,6 +55,9 @@ Extension Modules ----------------- +- Patch #756021: Special-case socket.inet_aton('255.255.255.255') for + platforms that don't have inet_aton(). + - Bug #1215928: Fix bz2.BZ2File.seek() for 64-bit file offsets. - Bug #1191043: Fix bz2.BZ2File.(x)readlines() for files containing one line

1 0

python/dist/src/Misc NEWS,1.1353,1.1354
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18724/Misc Modified Files: NEWS Log Message: typo Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1353 retrieving revision 1.1354 diff -u -d -r1.1353 -r1.1354 --- NEWS 26 Aug 2005 06:42:30 -0000 1.1353 +++ NEWS 26 Aug 2005 06:43:52 -0000 1.1354 @@ -12,7 +12,7 @@ Core and builtins ----------------- -- Disallow keyword arguments for type constructors that don't use it +- Disallow keyword arguments for type constructors that don't use them (fixes bug #1119418). - Forward UnicodeDecodeError into SyntaxError for source encoding errors.

1 0

python/dist/src/Modules arraymodule.c, 2.97, 2.97.2.1 itertoolsmodule.c, 1.39, 1.39.2.1 operator.c, 2.29, 2.29.4.1 _randommodule.c, 1.7, 1.7.4.1 zipimport.c, 1.18, 1.18.2.1 collectionsmodule.c, 1.36, 1.36.2.1
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18531/Modules Modified Files: Tag: release24-maint arraymodule.c itertoolsmodule.c operator.c _randommodule.c zipimport.c collectionsmodule.c Log Message: Disallow keyword arguments for type constructors that don't use them (fixes #1119418). Index: arraymodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/arraymodule.c,v retrieving revision 2.97 retrieving revision 2.97.2.1 diff -u -d -r2.97 -r2.97.2.1 --- arraymodule.c 29 Aug 2004 07:50:42 -0000 2.97 +++ arraymodule.c 26 Aug 2005 06:43:16 -0000 2.97.2.1 @@ -1774,18 +1774,9 @@ 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; Index: itertoolsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/itertoolsmodule.c,v retrieving revision 1.39 retrieving revision 1.39.2.1 diff -u -d -r1.39 -r1.39.2.1 --- itertoolsmodule.c 17 Oct 2004 19:36:57 -0000 1.39 +++ itertoolsmodule.c 26 Aug 2005 06:43:16 -0000 1.39.2.1 @@ -618,6 +618,9 @@ 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 @@ 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 @@ 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 @@ int numargs; isliceobject *lz; + if (!_PyArg_NoKeywords("islice()", kwds)) + return NULL; + numargs = PyTuple_Size(args); if (!PyArg_ParseTuple(args, "OO|Ol:islice", &seq, &a1, &a2, &step)) return NULL; @@ -1234,6 +1246,9 @@ PyObject *it; starmapobject *lz; + if (!_PyArg_NoKeywords("starmap()", kwds)) + return NULL; + if (!PyArg_UnpackTuple(args, "starmap", 2, 2, &func, &seq)) return NULL; @@ -1363,6 +1378,9 @@ imapobject *lz; int numargs, i; + if (!_PyArg_NoKeywords("imap()", kwds)) + return NULL; + numargs = PyTuple_Size(args); if (numargs < 2) { PyErr_SetString(PyExc_TypeError, @@ -1542,6 +1560,9 @@ int i; PyObject *ittuple; + if (!_PyArg_NoKeywords("chain()", kwds)) + return NULL; + /* obtain iterators */ assert(PyTuple_Check(args)); ittuple = PyTuple_New(tuplesize); @@ -1682,6 +1703,9 @@ PyObject *it; ifilterobject *lz; + if (!_PyArg_NoKeywords("ifilter()", kwds)) + return NULL; + if (!PyArg_UnpackTuple(args, "ifilter", 2, 2, &func, &seq)) return NULL; @@ -1823,6 +1847,9 @@ PyObject *it; ifilterfalseobject *lz; + if (!_PyArg_NoKeywords("ifilterfalse()", kwds)) + return NULL; + if (!PyArg_UnpackTuple(args, "ifilterfalse", 2, 2, &func, &seq)) return NULL; @@ -1962,6 +1989,9 @@ countobject *lz; long cnt = 0; + if (!_PyArg_NoKeywords("count()", kwds)) + return NULL; + if (!PyArg_ParseTuple(args, "|l:count", &cnt)) return NULL; @@ -2058,6 +2088,9 @@ PyObject *result; int tuplesize = PySequence_Length(args); + if (!_PyArg_NoKeywords("izip()", kwds)) + return NULL; + /* args must be a tuple */ assert(PyTuple_Check(args)); @@ -2238,6 +2271,9 @@ PyObject *element; long cnt = -1; + if (!_PyArg_NoKeywords("repeat()", kwds)) + return NULL; + if (!PyArg_ParseTuple(args, "O|l:repeat", &element, &cnt)) return NULL; Index: operator.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/operator.c,v retrieving revision 2.29 retrieving revision 2.29.4.1 diff -u -d -r2.29 -r2.29.4.1 --- operator.c 4 Dec 2003 22:17:49 -0000 2.29 +++ operator.c 26 Aug 2005 06:43:16 -0000 2.29.4.1 @@ -267,6 +267,9 @@ itemgetterobject *ig; PyObject *item; + if (!_PyArg_NoKeywords("itemgetter()", kdws)) + return NULL; + if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &item)) return NULL; @@ -374,6 +377,9 @@ attrgetterobject *ag; PyObject *attr; + if (!_PyArg_NoKeywords("attrgetter()", kwds)) + return NULL; + if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &attr)) return NULL; Index: _randommodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_randommodule.c,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -u -d -r1.7 -r1.7.4.1 --- _randommodule.c 5 Oct 2003 09:09:15 -0000 1.7 +++ _randommodule.c 26 Aug 2005 06:43:16 -0000 1.7.4.1 @@ -481,6 +481,9 @@ RandomObject *self; PyObject *tmp; + if (!_PyArg_NoKeywords("Random()", kwds)) + return NULL; + self = (RandomObject *)type->tp_alloc(type, 0); if (self == NULL) return NULL; Index: zipimport.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/zipimport.c,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -d -r1.18 -r1.18.2.1 --- zipimport.c 10 Nov 2004 13:08:35 -0000 1.18 +++ zipimport.c 26 Aug 2005 06:43:16 -0000 1.18.2.1 @@ -65,6 +65,9 @@ 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; Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -u -d -r1.36 -r1.36.2.1 --- collectionsmodule.c 9 Nov 2004 07:27:34 -0000 1.36 +++ collectionsmodule.c 26 Aug 2005 06:43:16 -0000 1.36.2.1 @@ -95,6 +95,9 @@ dequeobject *deque; block *b; + if (!_PyArg_NoKeywords("deque()", kwds)) + return NULL; + /* create dequeobject structure */ deque = (dequeobject *)type->tp_alloc(type, 0); if (deque == NULL)

1 0

python/dist/src/Include modsupport.h, 2.41, 2.41.4.1
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18531/Include Modified Files: Tag: release24-maint modsupport.h Log Message: Disallow keyword arguments for type constructors that don't use them (fixes #1119418). Index: modsupport.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/modsupport.h,v retrieving revision 2.41 retrieving revision 2.41.4.1 diff -u -d -r2.41 -r2.41.4.1 --- modsupport.h 10 Jul 2004 22:20:17 -0000 2.41 +++ modsupport.h 26 Aug 2005 06:43:16 -0000 2.41.4.1 @@ -15,6 +15,7 @@ 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 *,

1 0

python/dist/src/Python getargs.c, 2.102.2.2, 2.102.2.3
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18531/Python Modified Files: Tag: release24-maint getargs.c Log Message: Disallow keyword arguments for type constructors that don't use them (fixes #1119418). Index: getargs.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v retrieving revision 2.102.2.2 retrieving revision 2.102.2.3 diff -u -d -r2.102.2.2 -r2.102.2.3 --- getargs.c 3 Mar 2005 12:26:20 -0000 2.102.2.2 +++ getargs.c 26 Aug 2005 06:43:16 -0000 2.102.2.3 @@ -1594,3 +1594,29 @@ 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; +} + + +

1 0

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
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

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;

1 0

python/dist/src/Misc NEWS, 1.1193.2.86, 1.1193.2.87
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18531/Misc Modified Files: Tag: release24-maint NEWS Log Message: Disallow keyword arguments for type constructors that don't use them (fixes #1119418). Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.86 retrieving revision 1.1193.2.87 diff -u -d -r1.1193.2.86 -r1.1193.2.87 --- NEWS 25 Aug 2005 13:10:58 -0000 1.1193.2.86 +++ NEWS 26 Aug 2005 06:43:16 -0000 1.1193.2.87 @@ -12,6 +12,9 @@ Core and builtins ----------------- +- Disallow keyword arguments for type constructors that don't use them + (fixes bug #1119418). + - Forward UnicodeDecodeError into SyntaxError for source encoding errors. - SF bug #900092: When tracing (e.g. for hotshot), restore 'return' events for

1 0

python/dist/src/Objects rangeobject.c, 2.54, 2.55 setobject.c, 1.55, 1.56 bufferobject.c, 2.26, 2.27 sliceobject.c, 2.22, 2.23
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18370/Objects Modified Files: rangeobject.c setobject.c bufferobject.c sliceobject.c Log Message: Disallow keyword arguments for type constructors that don't use them. (fixes bug #1119418) Index: rangeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/rangeobject.c,v retrieving revision 2.54 retrieving revision 2.55 diff -u -d -r2.54 -r2.55 --- rangeobject.c 3 Dec 2004 11:45:13 -0000 2.54 +++ rangeobject.c 26 Aug 2005 06:42:30 -0000 2.55 @@ -45,6 +45,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.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- setobject.c 24 Aug 2005 00:24:40 -0000 1.55 +++ setobject.c 26 Aug 2005 06:42:30 -0000 1.56 @@ -935,6 +935,9 @@ { 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 @@ 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.27 diff -u -d -r2.26 -r2.27 --- bufferobject.c 24 Sep 2004 19:17:26 -0000 2.26 +++ bufferobject.c 26 Aug 2005 06:42:30 -0000 2.27 @@ -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.23 diff -u -d -r2.22 -r2.23 --- sliceobject.c 5 Sep 2003 14:27:30 -0000 2.22 +++ sliceobject.c 26 Aug 2005 06:42:30 -0000 2.23 @@ -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;

1 0

python/dist/src/Modules arraymodule.c, 2.98, 2.99 itertoolsmodule.c, 1.40, 1.41 operator.c, 2.30, 2.31 _randommodule.c, 1.7, 1.8 zipimport.c, 1.18, 1.19 collectionsmodule.c, 1.38, 1.39
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18370/Modules Modified Files: arraymodule.c itertoolsmodule.c operator.c _randommodule.c zipimport.c collectionsmodule.c Log Message: Disallow keyword arguments for type constructors that don't use them. (fixes bug #1119418) Index: arraymodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/arraymodule.c,v retrieving revision 2.98 retrieving revision 2.99 diff -u -d -r2.98 -r2.99 --- arraymodule.c 16 Dec 2004 16:23:39 -0000 2.98 +++ arraymodule.c 26 Aug 2005 06:42:30 -0000 2.99 @@ -1799,18 +1799,9 @@ 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; Index: itertoolsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/itertoolsmodule.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- itertoolsmodule.c 5 Dec 2004 09:25:51 -0000 1.40 +++ itertoolsmodule.c 26 Aug 2005 06:42:30 -0000 1.41 @@ -618,6 +618,9 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ PyObject *element; long cnt = -1; + if (!_PyArg_NoKeywords("repeat()", kwds)) + return NULL; + if (!PyArg_ParseTuple(args, "O|l:repeat", &element, &cnt)) return NULL; Index: operator.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/operator.c,v retrieving revision 2.30 retrieving revision 2.31 diff -u -d -r2.30 -r2.31 --- operator.c 9 Mar 2005 16:38:46 -0000 2.30 +++ operator.c 26 Aug 2005 06:42:30 -0000 2.31 @@ -269,6 +269,9 @@ 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 @@ 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)) Index: _randommodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_randommodule.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- _randommodule.c 5 Oct 2003 09:09:15 -0000 1.7 +++ _randommodule.c 26 Aug 2005 06:42:30 -0000 1.8 @@ -481,6 +481,9 @@ RandomObject *self; PyObject *tmp; + if (!_PyArg_NoKeywords("Random()", kwds)) + return NULL; + self = (RandomObject *)type->tp_alloc(type, 0); if (self == NULL) return NULL; Index: zipimport.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/zipimport.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- zipimport.c 10 Nov 2004 13:08:35 -0000 1.18 +++ zipimport.c 26 Aug 2005 06:42:30 -0000 1.19 @@ -65,6 +65,9 @@ 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; Index: collectionsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/collectionsmodule.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- collectionsmodule.c 19 Mar 2005 00:00:48 -0000 1.38 +++ collectionsmodule.c 26 Aug 2005 06:42:30 -0000 1.39 @@ -95,6 +95,9 @@ dequeobject *deque; block *b; + if (!_PyArg_NoKeywords("deque()", kwds)) + return NULL; + /* create dequeobject structure */ deque = (dequeobject *)type->tp_alloc(type, 0); if (deque == NULL)

1 0

python/dist/src/Include modsupport.h,2.41,2.42
by birkenfeld＠users.sourceforge.net 26 Aug '05

26 Aug '05

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18370/Include Modified Files: modsupport.h Log Message: Disallow keyword arguments for type constructors that don't use them. (fixes bug #1119418) Index: modsupport.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/modsupport.h,v retrieving revision 2.41 retrieving revision 2.42 diff -u -d -r2.41 -r2.42 --- modsupport.h 10 Jul 2004 22:20:17 -0000 2.41 +++ modsupport.h 26 Aug 2005 06:42:30 -0000 2.42 @@ -15,6 +15,7 @@ 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 *,

1 0